diff options
| author | teor <teor@torproject.org> | 2019-11-06 11:18:09 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 11:18:09 +1000 |
| commit | 4abfcb7997e4a753643fd969317c502efc6be06e (patch) | |
| tree | db54814d65d1daecce43b836c1ee5780e85b2eee /src/test | |
| parent | 0e2834a3718a3932cfe8d3148d203a0604451073 (diff) | |
| parent | cf2b00d3f50f3421c3c22777113e25d5f7812e67 (diff) | |
| download | tor-4abfcb7997e4a753643fd969317c502efc6be06e.tar.gz tor-4abfcb7997e4a753643fd969317c502efc6be06e.zip | |
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_rebind.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 45ad1c5469..30a587858f 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -31,15 +31,17 @@ def wait_for_log(s): cutoff = time.time() + LOG_TIMEOUT while time.time() < cutoff: l = tor_process.stdout.readline() - l = l.decode('utf8') + l = l.decode('utf8', 'backslashreplace') if s in l: logging.info('Tor logged: "{}"'.format(l.strip())) return - logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) # readline() returns a blank string when there is no output # avoid busy-waiting - if len(s) == 0: + if len(l) == 0: + logging.debug('Tor has not logged anything, waiting for "{}"'.format(s)) time.sleep(LOG_WAIT) + else: + logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT)) def pick_random_port(): @@ -119,18 +121,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)): tor_process.terminate() fail('Cannot connect to ControlPort') -control_socket.sendall('AUTHENTICATE \r\n'.encode('utf8')) -control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('AUTHENTICATE \r\n'.encode('ascii')) +control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8')) +control_socket.sendall('SIGNAL HALT\r\n'.encode('ascii')) wait_for_log('exiting cleanly') logging.info('OK') |