From 7ec93cb977457b403a3b43acab0ed8f6c482dbd7 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Tue, 11 May 2021 09:22:12 -0700
Subject: [PATCH 1/2] poll_oneoff_stdio test: increase timeout to 20ms

---
 crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
index b5c3bad73e..07ac90b792 100644
--- a/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
+++ b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::mem::MaybeUninit;
 use wasi_tests::{assert_errno, STDERR_FD, STDIN_FD, STDOUT_FD};
 
+const TIMEOUT: u64 = 20_000_000u64; // 20 milliseconds, required to satisfy slow execution in CI
 const CLOCK_ID: wasi::Userdata = 0x0123_45678;
 const STDIN_ID: wasi::Userdata = 0x8765_43210;
 
@@ -18,7 +19,7 @@ unsafe fn poll_oneoff_impl(r#in: &[wasi::Subscription]) -> Result<Vec<wasi::Even
 unsafe fn test_stdin_read() {
     let clock = wasi::SubscriptionClock {
         id: wasi::CLOCKID_MONOTONIC,
-        timeout: 5_000_000u64, // 5 milliseconds
+        timeout: TIMEOUT,
         precision: 0,
         flags: 0,
     };
@@ -95,7 +96,7 @@ unsafe fn test_stdout_stderr_write() {
             u: wasi::SubscriptionUU {
                 clock: wasi::SubscriptionClock {
                     id: wasi::CLOCKID_MONOTONIC,
-                    timeout: 10_000_000u64, // 10 milliseconds
+                    timeout: TIMEOUT,
                     precision: 0,
                     flags: 0,
                 },

From e66909f710be9cd1dfb1a28088cdd6d3e601e38f Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Tue, 11 May 2021 09:24:15 -0700
Subject: [PATCH 2/2] wasi-tokio: increase timeout in poll_oneoff test here as
 well

---
 crates/wasi-common/tokio/tests/poll_oneoff.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/wasi-common/tokio/tests/poll_oneoff.rs b/crates/wasi-common/tokio/tests/poll_oneoff.rs
index fa04f4604e..32c91c335a 100644
--- a/crates/wasi-common/tokio/tests/poll_oneoff.rs
+++ b/crates/wasi-common/tokio/tests/poll_oneoff.rs
@@ -8,6 +8,8 @@ use wasi_common::{
 };
 use wasi_tokio::{clocks_ctx, sched::poll_oneoff, Dir};
 
+const TIMEOUT: Duration = Duration::from_millis(20); // Required for slow execution in CI
+
 #[tokio::test(flavor = "multi_thread")]
 async fn empty_file_readable() -> Result<(), Error> {
     let clocks = clocks_ctx();
@@ -40,7 +42,7 @@ async fn empty_file_readable() -> Result<(), Error> {
         clocks
             .monotonic
             .now(clocks.monotonic.resolution())
-            .checked_add(Duration::from_millis(10))
+            .checked_add(TIMEOUT)
             .unwrap(),
         clocks.monotonic.resolution(),
         Userdata::from(0),
@@ -82,7 +84,7 @@ async fn empty_file_writable() -> Result<(), Error> {
         clocks
             .monotonic
             .now(clocks.monotonic.resolution())
-            .checked_add(Duration::from_millis(10))
+            .checked_add(TIMEOUT)
             .unwrap(),
         clocks.monotonic.resolution(),
         Userdata::from(0),
@@ -109,7 +111,7 @@ async fn stdio_readable() -> Result<(), Error> {
     let deadline = clocks
         .monotonic
         .now(clocks.monotonic.resolution())
-        .checked_add(Duration::from_millis(10))
+        .checked_add(TIMEOUT)
         .unwrap();
 
     let mut waiting_on: HashMap<u64, Box<dyn WasiFile>> = vec![