commit d5cd861c377d336a5f5f9edb4b85e2c2cccaabf3 Author: Damian Johnson <atagar@torproject.org> Date: Thu Mar 29 18:52:11 2012 -0700 Trivial tweaks for version fixes Very minor changes to formatting and dropping a no-op line. --- test/integ/version.py | 1 - test/unit/version.py | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/integ/version.py b/test/integ/version.py index bdb22cb..906edbc 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -58,7 +58,6 @@ class TestVersion(unittest.TestCase): # 250-version=0.2.3.10-alpha-dev (git-65420e4cb5edcd02) # 250 OK - tor_version = list(version_response)[0][8:] tor_version = list(version_response)[0] tor_version = tor_version[8:tor_version.find(' ', 8)] stem.version.Version(tor_version) diff --git a/test/unit/version.py b/test/unit/version.py index ab255d2..4843321 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -8,7 +8,6 @@ import stem.util.system import test.mocking as mocking - TOR_VERSION_OUTPUT = """Mar 22 23:09:37.088 [notice] Tor v0.2.2.35 \ (git-73ff13ab3cc9570d). This is experimental software. Do not rely on it for \ strong anonymity. (Running on Linux i686) @@ -23,12 +22,12 @@ class TestVersion(unittest.TestCase): if command == "tor --version": return TOR_VERSION_OUTPUT.splitlines() else: - raise ValueError("stem.util.system.call received an unexpected command") - + raise ValueError("stem.util.system.call received an unexpected command: %s" % command) + mocking.mock(stem.util.system.call, _mock_call) version = stem.version.get_system_tor_version() self.assert_versions_match(version, 0, 2, 2, 35, None) - + def test_parsing(self): """ Tests parsing by the Version class constructor.