]> granicus.if.org Git - libevent/commitdiff
Increase the skew tolerance to 2 seconds in thread/deferred_cb_skew
authorChristopher Davis <chrisd@torproject.org>
Thu, 28 Oct 2010 17:11:25 +0000 (10:11 -0700)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Oct 2010 18:11:33 +0000 (14:11 -0400)
This is to make the test not fail on Sebastian Hahn's Win7 box.

test/regress_thread.c

index 6faf3050dee765d3edee06982dd162d4703955b7..51c333dc9ebddaca9caed74ade8bde2170715ff6 100644 (file)
@@ -460,6 +460,7 @@ thread_deferred_cb_skew(void *arg)
        struct basic_test_data *data = arg;
        struct timeval tv_timer = {4, 0};
        struct deferred_cb_queue *queue;
+       time_t elapsed;
        int i;
 
        queue = event_base_get_deferred_cb_queue(data->base);
@@ -475,8 +476,12 @@ thread_deferred_cb_skew(void *arg)
                        NULL, NULL);
        event_base_dispatch(data->base);
 
+       elapsed = timer_end - timer_start;
        TT_BLATHER(("callback count, %u", callback_count));
-       tt_int_op(timer_end - timer_start, ==, 4);
+       TT_BLATHER(("elapsed time, %u", (unsigned)elapsed));
+       /* XXX be more intelligent here.  just make sure skew is
+        * within 2 seconds for now. */
+       tt_assert(elapsed >= 4 && elapsed <= 6);
 
 end:
        for (i = 0; i < QUEUE_THREAD_COUNT; ++i)