diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 09:48:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 09:48:03 -0400 |
| commit | a4e8f945077b8eebbbd5be85f89b1631305ce1cc (patch) | |
| tree | 32f39e03cd10d4cc10dbe87bc50fb87b10fab325 | |
| parent | e6366f787c49bebd5faafa1b6f78c81ab463fd08 (diff) | |
| parent | b205714ba8fd65340e6f282db95663390d5d492e (diff) | |
| download | tor-a4e8f945077b8eebbbd5be85f89b1631305ce1cc.tar.gz tor-a4e8f945077b8eebbbd5be85f89b1631305ce1cc.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.2
| -rw-r--r-- | changes/bug26535.029 | 5 | ||||
| -rwxr-xr-x | src/test/ntor_ref.py | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/changes/bug26535.029 b/changes/bug26535.029 new file mode 100644 index 0000000000..111b539f17 --- /dev/null +++ b/changes/bug26535.029 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, compatibility): + - When running the ntor_ref.py test, make sure only to pass strings + (rather than "bytes" objects) to the Python subprocess module. + Python 3 on Windows seems to require this. Fixes bug 26535; bugfix on + 0.2.5.5-alpha. diff --git a/src/test/ntor_ref.py b/src/test/ntor_ref.py index c753588f97..51f218f512 100755 --- a/src/test/ntor_ref.py +++ b/src/test/ntor_ref.py @@ -336,13 +336,16 @@ def test_tor(): Call the test-ntor-cl command-line program to make sure we can interoperate with Tor's ntor program """ - enhex=lambda s: binascii.b2a_hex(s) + if sys.version_info[0] >= 3: + enhex=lambda s: binascii.b2a_hex(s).decode("ascii") + else: + enhex=lambda s: binascii.b2a_hex(s) dehex=lambda s: binascii.a2b_hex(s.strip()) - PROG = b"./src/test/test-ntor-cl" + PROG = "./src/test/test-ntor-cl" def tor_client1(node_id, pubkey_B): " returns (msg, state) " - p = subprocess.Popen([PROG, b"client1", enhex(node_id), + p = subprocess.Popen([PROG, "client1", enhex(node_id), enhex(pubkey_B.serialize())], stdout=subprocess.PIPE) return map(dehex, p.stdout.readlines()) |