Travis: Skip test_rebind on macOS builds

Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.

Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.

Fixes bug 30713; bugfix on 0.3.5.1-alpha.

src/test/test_rebind.py

@@ -16,6 +16,10 @@ 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)):
@@ -65,6 +69,9 @@ if sys.hexversion < 0x02070000:
 if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000:
     fail("ERROR: unsupported Python3 version (should be >= 3.1)")
 
+if 'TOR_SKIP_TEST_REBIND' in os.environ:
+    skip('$TOR_SKIP_TEST_REBIND is set')
+
 control_port = pick_random_port()
 socks_port = pick_random_port()
 

src/test/test_rebind.sh

@@ -27,6 +27,6 @@ elif [ ! -d "$tmpdir" ]; then
   exit 3
 fi
 
-"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" || exitcode=1
+"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir"
 
-exit ${exitcode}
+exit $?