From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Sep 2018 12:16:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'github/bug27073_029'
X-Git-Tag: tor-0.3.5.2-alpha~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4199c8b2d0d53b7c906943e5f844aafa57b9047d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'github/bug27073_029'
---

4199c8b2d0d53b7c906943e5f844aafa57b9047d
diff --cc src/test/test_threads.c
index f0a4dd2057,448ab2034b..2bf5026061
--- a/src/test/test_threads.c
+++ b/src/test/test_threads.c
@@@ -275,14 -283,15 +283,15 @@@ test_threads_conditionvar(void *arg
    SPIN();
    tor_mutex_release(ti->mutex);
  
 -  tt_int_op(ti->value, ==, 1337);
 +  tt_int_op(ti->value, OP_EQ, 1337);
    if (!timeout) {
 -    tt_int_op(ti->n_shutdown, ==, 4);
 +    tt_int_op(ti->n_shutdown, OP_EQ, 4);
    } else {
-     tor_sleep_msec(200);
-     tor_mutex_acquire(ti->mutex);
+     const int GIVE_UP_AFTER_SEC = 30;
+     SPIN_UNTIL((ti->n_timeouts == 2 ||
+                 time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10);
 -    tt_int_op(ti->n_shutdown, ==, 2);
 -    tt_int_op(ti->n_timeouts, ==, 2);
 +    tt_int_op(ti->n_shutdown, OP_EQ, 2);
 +    tt_int_op(ti->n_timeouts, OP_EQ, 2);
      tor_mutex_release(ti->mutex);
    }