commit 430dd2da6e97c7186b03caabbbac95d74c3d8b82 Merge: 6a6f7eb67 be0a4be27 Author: teor teor@torproject.org Date: Mon Jun 10 20:50:53 2019 +1000

Merge branch 'bug30713_035' into bug30713_040

.travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-)

diff --cc src/test/test_rebind.py index 7b12626a9,77829ca92..232b20032 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@@ -16,12 -16,15 +16,16 @@@ def fail(msg) logging.error('FAIL') sys.exit(msg)

+ def skip(msg): + logging.warning('SKIP: {}'.format(msg)) + sys.exit(77) + def try_connecting_to_socksport(): socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if socks_socket.connect_ex(('127.0.0.1', socks_port)): + e = socks_socket.connect_ex(('127.0.0.1', socks_port)) + if e: tor_process.terminate() - fail('Cannot connect to SOCKSPort') + fail('Cannot connect to SOCKSPort: error ' + os.strerror(e)) socks_socket.close()

def wait_for_log(s):