commit 8b3e1f7913ece5fdfc64c68d1051143ab61f46fd Author: Damian Johnson atagar@torproject.org Date: Mon Mar 13 09:23:33 2017 -0700

Drop debugging print

Oops, not sure where this came from. Certainly shouldn't be in the test. --- stem/descriptor/server_descriptor.py | 4 ++-- test/unit/descriptor/server_descriptor.py | 3 ++- test/unit/manual.py | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9cd709b..dfb1bc5 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -31,11 +31,11 @@ etc). This information is provided from a few sources... +- get_annotation_lines - lines that provided the annotations """

+import base64 +import binascii import functools import hashlib import re -import base64 -import binascii

import stem.descriptor.extrainfo_descriptor import stem.exit_policy diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index b43a6f3..b48f3a6 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -3,10 +3,10 @@ Unit tests for stem.descriptor.server_descriptor. """

import datetime -import time import io import pickle import tarfile +import time import unittest

import stem.descriptor.server_descriptor @@ -306,6 +306,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ Parses a server descriptor with an expired ed25519 certificate """ + desc_text = open(get_resource('bridge_descriptor_with_ed25519'), 'rb').read() desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text), validate = True) self.assertRaises(ValueError, list, desc_iter) diff --git a/test/unit/manual.py b/test/unit/manual.py index 06e0071..becefd5 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -174,9 +174,6 @@ class TestManual(unittest.TestCase): self.assertEqual(EXPECTED_CLI_OPTIONS, manual.commandline_options) self.assertEqual(EXPECTED_SIGNALS, manual.signals) self.assertEqual(EXPECTED_FILES, manual.files) - if EXPECTED_CONFIG_OPTIONS != manual.config_options: - print(EXPECTED_CONFIG_OPTIONS) - print(manual.config_options) self.assertEqual(EXPECTED_CONFIG_OPTIONS, manual.config_options)

def test_parsing_with_unknown_options(self):