diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-19 15:36:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-19 15:36:03 -0500 |
| commit | b7018b1a24fbdaed2805e11b0343e03445f8cb7e (patch) | |
| tree | f1bf4fc9447e43f059f6b75cb57fb079ddcc3837 /src/test/test_rebind.py | |
| parent | 26bbeb298d1f5692bc18f38d61379087436461a2 (diff) | |
| parent | 315c21d2e200fc45e4886fb7ab32e01a3a8354e9 (diff) | |
| download | tor-b7018b1a24fbdaed2805e11b0343e03445f8cb7e.tar.gz tor-b7018b1a24fbdaed2805e11b0343e03445f8cb7e.zip | |
Merge branch 'ticket28883_035' into maint-0.3.5
Diffstat (limited to 'src/test/test_rebind.py')
| -rw-r--r-- | src/test/test_rebind.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 6f759b717e..00e5a08be7 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -11,7 +11,6 @@ import time LOG_TIMEOUT = 60.0 LOG_WAIT = 0.1 -LOG_CHECK_LIMIT = LOG_TIMEOUT / LOG_WAIT def fail(msg): logging.error('FAIL') @@ -25,8 +24,8 @@ def try_connecting_to_socksport(): socks_socket.close() def wait_for_log(s): - log_checked = 0 - while log_checked < LOG_CHECK_LIMIT: + cutoff = time.time() + LOG_TIMEOUT + while time.time() < cutoff: l = tor_process.stdout.readline() l = l.decode('utf8') if s in l: @@ -37,7 +36,6 @@ def wait_for_log(s): # avoid busy-waiting if len(s) == 0: time.sleep(LOG_WAIT) - log_checked += 1 fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT)) def pick_random_port(): |