rewrite an llframetimer test to be less sensitive to extended ms_sleep calls

1 files changed, 15 insertions, 12 deletions

diff --git a/indra/llcommon/tests/llframetimer_test.cpp b/indra/llcommon/tests/llframetimer_test.cpp
index 8ac1c91a3a..46fc4ce93a 100755
--- a/indra/llcommon/tests/llframetimer_test.cpp
+++ b/indra/llcommon/tests/llframetimer_test.cpp
@@ -88,21 +88,24 @@ namespace tut
 		seconds_since_epoch += 2.0;
 		LLFrameTimer timer;
 		timer.setExpiryAt(seconds_since_epoch);
-		ensure("timer not expired on create", !timer.hasExpired());
-		int ii;
-		for(ii = 0; ii < 10; ++ii)
+		/*
+		 * Note that the ms_sleep(200) below is only guaranteed to return
+		 * in 200ms _or_more_, so it should be true that by the 10th
+		 * iteration we've gotten to the 2 seconds requested above
+		 * and the timer should expire, but it can expire in fewer iterations
+		 * if one or more of the ms_sleep calls takes longer.
+		 * (as it did when we moved to Mac OS X 10.10)
+		 */
+		int iterations_until_expiration = 0;
+		while ( !timer.hasExpired() )
 		{
-			ms_sleep(150);
-			LLFrameTimer::updateFrameTime();			
-		}
-		ensure("timer not expired after a bit", !timer.hasExpired());
-		for(ii = 0; ii < 10; ++ii)
-		{
-			ms_sleep(100);
-			LLFrameTimer::updateFrameTime();			
+			ms_sleep(200);
+			LLFrameTimer::updateFrameTime();
+			iterations_until_expiration++;
 		}
-		ensure("timer expired", timer.hasExpired());
+		ensure("timer took too long to expire", iterations_until_expiration <= 10);
 	}
+	
 /*
 	template<> template<>
 	void frametimer_object_t::test<4>()