From: teor <teor@torproject.org>
Date: Mon, 10 Jun 2019 10:50:53 +0000 (+1000)
Subject: Merge branch 'bug30713_035' into bug30713_040
X-Git-Tag: tor-0.4.1.3-alpha~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=430dd2da6e97c7186b03caabbbac95d74c3d8b82;p=thirdparty%2Ftor.git

Merge branch 'bug30713_035' into bug30713_040
---

430dd2da6e97c7186b03caabbbac95d74c3d8b82
diff --cc src/test/test_rebind.py
index 7b12626a91,77829ca920..232b200326
--- 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):