[tor-commits] [tor/release-0.2.3] Bump the test util/threads timeout up to 150 sec

[nickm at torproject.org]

commit 4645f28c3b125f9d281eb457d110c431a6a0b166
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 25 13:44:34 2012 -0400

    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.
---
 changes/bug6227      |    3 +++
 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 0000000..77b06ac
--- /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 fab9595..9b9fccf 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);