diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-25 13:44:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-25 13:44:34 -0400 |
| commit | 4645f28c3b125f9d281eb457d110c431a6a0b166 (patch) | |
| tree | d6270af279e8724f8a1b30ce9f70fd3be40a8889 | |
| parent | 53e4452f985cad0947cd8ebfa0a1c198b6a7da7d (diff) | |
| download | tor-4645f28c3b125f9d281eb457d110c431a6a0b166.tar.gz tor-4645f28c3b125f9d281eb457d110c431a6a0b166.zip | |
Bump the test util/threads timeout up to 150 sec
This should make some debian build systems happier.
Also, increase the select() timeout to a more reasonable 100 msec.
| -rw-r--r-- | changes/bug6227 | 3 | ||||
| -rw-r--r-- | src/test/test_util.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000000..77b06ac511 --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab95953bd..9b9fccfb7d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex); |