diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-21 16:13:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 16:13:59 -0400 |
| commit | 63e08f56b889eb56ae555b5e8505187331017ff5 (patch) | |
| tree | ee042a0b1f0d416eaf41c9eff3bd5a88e43b7457 | |
| parent | b7bd162af70ced68d3ea9d738c8cacb5bea75a1c (diff) | |
| parent | 53d8aa13682caccbad3fff094c78cc4229e8fe13 (diff) | |
| download | tor-63e08f56b889eb56ae555b5e8505187331017ff5.tar.gz tor-63e08f56b889eb56ae555b5e8505187331017ff5.zip | |
Merge remote-tracking branch 'tor-github/pr/365'
| -rw-r--r-- | changes/bug27675 | 3 | ||||
| -rw-r--r-- | src/test/test_rebind.py | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug27675 b/changes/bug27675 new file mode 100644 index 0000000000..e4c3eb5a05 --- /dev/null +++ b/changes/bug27675 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - In test_rebind.py check if Python version is in supported + ranges. Fixes bug 27675; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index f02cb79b78..7ba3a5796d 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -1,5 +1,3 @@ -#!/usr/bin/python3 - from __future__ import print_function import sys @@ -37,6 +35,12 @@ def pick_random_port(): return port +if sys.hexversion < 0x02070000: + sys.exit("ERROR: unsupported Python version (should be >= 2.7)") + +if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000: + sys.exit("ERROR: unsupported Python3 version (should be >= 3.1)") + control_port = pick_random_port() socks_port = pick_random_port() |