Commit 4645f28c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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.
parent 53e4452f

changes/bug6227

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test_util.c

+2 −2
Original line number Diff line number Diff line
@@ -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);