diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 18:24:59 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 18:24:59 -0400 |
commit | 6d405e2d018e6722288e1cfbf477d985b8384a54 (patch) | |
tree | 0b3927f2a04aa29d824335f72b7e3484b0d1e294 /indra/llcorehttp | |
parent | 6f5790da38b3005292d3dbeaad778ea740110e33 (diff) |
Convert one more unit test over to improved waiting scheme to avoid build failures.
Diffstat (limited to 'indra/llcorehttp')
-rwxr-xr-x | indra/llcorehttp/tests/test_httprequest.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp index 2311753c65..43f7e36da5 100755 --- a/indra/llcorehttp/tests/test_httprequest.hpp +++ b/indra/llcorehttp/tests/test_httprequest.hpp @@ -3241,11 +3241,11 @@ void HttpRequestTestObjectType::test<23>() // Run the notification pump. int count(0); - int limit(300); // One retry but several seconds needed + int limit(LOOP_COUNT_LONG); while (count++ < limit && mHandlerCalls < url_limit) { req->update(0); - usleep(100000); + usleep(LOOP_SLEEP_INTERVAL); } ensure("Request executed in reasonable time", count < limit); ensure("One handler invocation for request", mHandlerCalls == url_limit); @@ -3258,21 +3258,21 @@ void HttpRequestTestObjectType::test<23>() // Run the notification pump again count = 0; - limit = 100; + limit = LOOP_COUNT_LONG; while (count++ < limit && mHandlerCalls < 1) { req->update(1000000); - usleep(100000); + usleep(LOOP_SLEEP_INTERVAL); } ensure("Second request executed in reasonable time", count < limit); ensure("Second handler invocation", mHandlerCalls == 1); // See that we actually shutdown the thread count = 0; - limit = 10; + limit = LOOP_COUNT_SHORT; while (count++ < limit && ! HttpService::isStopped()) { - usleep(100000); + usleep(LOOP_SLEEP_INTERVAL); } ensure("Thread actually stopped running", HttpService::isStopped()); |