Merge branch 'DRTVWR-589' of github.com:/secondlife/viewer-private into DRTVWR-589

3 files changed, 20 insertions, 7 deletions

diff --git a/indra/llcommon/tests/threadsafeschedule_test.cpp b/indra/llcommon/tests/threadsafeschedule_test.cpp
index c421cc7b1c..876281eae0 100644
--- a/indra/llcommon/tests/threadsafeschedule_test.cpp
+++ b/indra/llcommon/tests/threadsafeschedule_test.cpp
@@ -46,11 +46,11 @@ namespace tut
         // the real time required for each push() call. Explicitly increment
         // the timestamp for each one -- but since we're passing explicit
         // timestamps, make the queue reorder them.
-        queue.push(Queue::TimeTuple(Queue::Clock::now() + 200ms, "ghi"));
+        queue.push(Queue::TimeTuple(Queue::Clock::now() + 2000ms, "ghi"));
         // Given the various push() overloads, you have to match the type
         // exactly: conversions are ambiguous.
         queue.push("abc"s);
-        queue.push(Queue::Clock::now() + 100ms, "def");
+        queue.push(Queue::Clock::now() + 1000ms, "def");
         queue.close();
         auto entry = queue.pop();
         ensure_equals("failed to pop first", std::get<0>(entry), "abc"s);
diff --git a/indra/llcommon/tests/workqueue_test.cpp b/indra/llcommon/tests/workqueue_test.cpp
index 1d73f7aa0d..7655a7aa1f 100644
--- a/indra/llcommon/tests/workqueue_test.cpp
+++ b/indra/llcommon/tests/workqueue_test.cpp
@@ -83,7 +83,11 @@ namespace tut
         // signal the work item that it can quit; consider LLOneShotCond.
         LLCond<Shared> data;
         auto start = WorkQueue::TimePoint::clock::now();
-        auto interval = 100ms;
+        // 2s seems like a long time to wait, since it directly impacts the
+        // duration of this test program. Unfortunately GitHub's Mac runners
+        // are pretty wimpy, and we're getting spurious "too late" errors just
+        // because the thread doesn't wake up as soon as we want.
+        auto interval = 2s;
         queue.postEvery(
             interval,
             [&data, count = 0]
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 40243a8ad6..83e45661f8 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -1156,20 +1156,29 @@ namespace tut
 		chain.clear();
 
 		// pump for a bit and make sure all 3 chains are running
-		pump_loop(mPump,0.1f);
+		for (int retry = 0; mPump->runningChains() < 3 && retry < 10; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		count = mPump->runningChains();
-		// ensure_equals("client chain onboard", count, 3); commented out because it fails frequently - appears to be timing sensitive
+		ensure_equals("client chain onboard", count, 3);
 		LL_DEBUGS() << "** request should have been sent." << LL_ENDL;
 
 		// pump for long enough the the client socket closes, and the
 		// server socket should not be closed yet.
-		pump_loop(mPump,0.2f);
+		for (int retry = 0; mPump->runningChains() == 3 && retry < 10; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		count = mPump->runningChains();
 		ensure_equals("client chain timed out ", count, 2);
 		LL_DEBUGS() << "** client chain should be closed." << LL_ENDL;
 
 		// At this point, the socket should be closed by the timeout
-		pump_loop(mPump,1.0f);
+		for (int retry = 0; mPump->runningChains() > 1 && retry < 10; ++retry)
+		{
+			pump_loop(mPump, 0.1f);
+		}
 		count = mPump->runningChains();
 		ensure_equals("accepted socked close", count, 1);
 		LL_DEBUGS() << "** Sleeper should have timed out.." << LL_ENDL;