July 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] ntor_ref.py: pass only strings to subprocess.Popen
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit fc5f8b6931dbbfcf31157cb9e4f68da56b6ff6aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 14:04:46 2018 -0400 ntor_ref.py: pass only strings to subprocess.Popen Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug introduced in f4be34f70d6f277a0f3f73e, which was apparently intended itself as a Python3 workaround. --- changes/bug26535.029 | 5 +++++ 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 000000000..111b539f1 --- /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 df065853f..5ec117f2b 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())

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 4c094436c50a489d2ecdd09b8dfb7dc9a3c97389 Merge: 9aeef05f8 a4e8f9450 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26535.029 | 5 +++++ changes/bug26535.032 | 5 +++++ src/test/hs_ntor_ref.py | 7 +++++-- src/test/ntor_ref.py | 9 ++++++--- 4 files changed, 21 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc Merge: e6366f787 b205714ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'bug26535_032' into maint-0.3.2
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit e6366f787c49bebd5faafa1b6f78c81ab463fd08 Merge: 3c97b148a 3baf3d01c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:48:00 2018 -0400 Merge branch 'bug26535_032' into maint-0.3.2 changes/bug26535.032 | 5 +++++ src/test/hs_ntor_ref.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'bug26535_029' into maint-0.2.9
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit b205714ba8fd65340e6f282db95663390d5d492e Merge: 1953a7e61 fc5f8b693 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:47:41 2018 -0400 Merge branch 'bug26535_029' into maint-0.2.9 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] ntor_ref.py: pass only strings to subprocess.Popen
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit fc5f8b6931dbbfcf31157cb9e4f68da56b6ff6aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 14:04:46 2018 -0400 ntor_ref.py: pass only strings to subprocess.Popen Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug introduced in f4be34f70d6f277a0f3f73e, which was apparently intended itself as a Python3 workaround. --- changes/bug26535.029 | 5 +++++ 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 000000000..111b539f1 --- /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 df065853f..5ec117f2b 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())

1 0

[tor/release-0.3.4] Merge branch 'bug26535_029' into maint-0.2.9
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit b205714ba8fd65340e6f282db95663390d5d492e Merge: 1953a7e61 fc5f8b693 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:47:41 2018 -0400 Merge branch 'bug26535_029' into maint-0.2.9 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug26535_032' into maint-0.3.2
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit e6366f787c49bebd5faafa1b6f78c81ab463fd08 Merge: 3c97b148a 3baf3d01c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:48:00 2018 -0400 Merge branch 'bug26535_032' into maint-0.3.2 changes/bug26535.032 | 5 +++++ src/test/hs_ntor_ref.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit b489e8cfeaaf4d66f048e51453873a0357dd2ba3 Merge: b22b60365 4c094436c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26535.029 | 5 +++++ changes/bug26535.032 | 5 +++++ src/test/hs_ntor_ref.py | 7 +++++-- src/test/ntor_ref.py | 9 ++++++--- 4 files changed, 21 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] hs_ntor_ref.py: pass only strings to subprocess.Popen
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 3baf3d01cbf4cca91a8d18f4c86ae5aa05818f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 14:04:46 2018 -0400 hs_ntor_ref.py: pass only strings to subprocess.Popen Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha. --- changes/bug26535.032 | 5 +++++ src/test/hs_ntor_ref.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug26535.032 b/changes/bug26535.032 new file mode 100644 index 000000000..395d08d81 --- /dev/null +++ b/changes/bug26535.032 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, compatibility): + - When running the hs_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.3.1.1-alpha. diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 2ed9324e1..542b02d2e 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -234,8 +234,11 @@ Utilities for communicating with the little-t-tor ntor wrapper to conduct the integration tests """ -PROG = b"./src/test/test-hs-ntor-cl" -enhex=lambda s: binascii.b2a_hex(s) +PROG = "./src/test/test-hs-ntor-cl" +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()) def tor_client1(intro_auth_pubkey_str, intro_enc_pubkey,

1 0