commit 778689d300d02f20cf73f649f5ede5b0634ac630 Author: Damian Johnson atagar@torproject.org Date: Sat Nov 4 14:17:58 2017 -0700
Stacktrace when calling get_circuits()
Running the ONLINE integ target uncovered another bug...
====================================================================== ERROR: test_get_circuits ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 1339, in test_get_circuits circuits = controller.get_circuits() File "/home/atagar/Desktop/stem/stem/control.py", line 482, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 3336, in get_circuits circ_message = stem.socket.recv_message(io.BytesIO(stem.util.str_tools._to_unicode('650 CIRC %s\r\n' % circ))) TypeError: 'unicode' does not have the buffer interface --- stem/control.py | 2 +- test/integ/manual.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/stem/control.py b/stem/control.py index 412740cc..1468e6c2 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3333,7 +3333,7 @@ class Controller(BaseController): response = self.get_info('circuit-status')
for circ in response.splitlines(): - circ_message = stem.socket.recv_message(io.BytesIO(stem.util.str_tools._to_unicode('650 CIRC %s\r\n' % circ))) + circ_message = stem.socket.recv_message(io.BytesIO(stem.util.str_tools._to_bytes('650 CIRC %s\r\n' % circ))) stem.response.convert('EVENT', circ_message, arrived_at = 0) circuits.append(circ_message)
diff --git a/test/integ/manual.py b/test/integ/manual.py index 4c000b98..1eb4fb76 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -36,7 +36,7 @@ EXPECTED_CATEGORIES = set([ 'AUTHORS', ])
-EXPECTED_CLI_OPTIONS = set(['-f FILE', '--hash-password PASSWORD', '--ignore-missing-torrc', '--defaults-torrc FILE', '--list-fingerprint', '--list-deprecated-options', '--allow-missing-torrc', '--nt-service', '--verify-config', '--service remove|start|stop', '--passphrase-fd FILEDES', '--keygen [--newpass]', '--list-torrc-options', '--service install [--options command-line options]', '--quiet|--hush', '--version', '-h, -help']) +EXPECTED_CLI_OPTIONS = set(['-f FILE', '--hash-password PASSWORD', '--ignore-missing-torrc', '--defaults-torrc FILE', '--key-expiration [purpose]', '--list-fingerprint', '--list-deprecated-options', '--allow-missing-torrc', '--nt-service', '--verify-config', '--service remove|start|stop', '--passphrase-fd FILEDES', '--keygen [--newpass]', '--list-torrc-options', '--service install [--options command-line options]', '--quiet|--hush', '--version', '-h, -help']) EXPECTED_SIGNALS = set(['SIGTERM', 'SIGINT', 'SIGHUP', 'SIGUSR1', 'SIGUSR2', 'SIGCHLD', 'SIGPIPE', 'SIGXFSZ'])
EXPECTED_DESCRIPTION = """ @@ -203,7 +203,7 @@ class TestManual(unittest.TestCase): assert_equal('signals', EXPECTED_SIGNALS, set(manual.signals.keys())) assert_equal('sighup description', 'Tor will catch this, clean up and sync to disk if necessary, and exit.', manual.signals['SIGTERM'])
- assert_equal('number of files', 44, len(manual.files)) + assert_equal('number of files', 50, len(manual.files)) assert_equal('lib path description', 'The tor process stores keys and other data here.', manual.files['@LOCALSTATEDIR@/lib/tor/'])
for category in Category: