[tor-commits] [stem/master] Combining TestNetworkStatusDocument and TestMicrodescriptorConsensus

[atagar at torproject.org]

commit 21e5a4cd578dc81496d8355e377048c3707488b0
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Aug 18 16:30:03 2012 -0700

    Combining TestNetworkStatusDocument and TestMicrodescriptorConsensus
    
    Having separate test classes was a fine idea, but resulted in our tests
    claiming that 'test.integ.descriptor.networkstatus' ran twice. That's
    confusing, so we either need to put them in separate files or merge the
    classes. Opting for the later for now since TestMicrodescriptorConsensus only
    had one test.
---
 run_tests.py                           |    1 -
 test/integ/descriptor/networkstatus.py |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index b0550d6..8d115f1 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -136,7 +136,6 @@ INTEG_TESTS = (
   test.integ.descriptor.server_descriptor.TestServerDescriptor,
   test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor,
   test.integ.descriptor.networkstatus.TestNetworkStatusDocument,
-  test.integ.descriptor.networkstatus.TestMicrodescriptorConsensus,
   test.integ.version.TestVersion,
   test.integ.response.protocolinfo.TestProtocolInfo,
   test.integ.process.TestProcess,
diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py
index bd326ad..4cbf42c 100644
--- a/test/integ/descriptor/networkstatus.py
+++ b/test/integ/descriptor/networkstatus.py
@@ -1,5 +1,5 @@
 """
-Integration tests for stem.descriptor.server_descriptor.
+Integration tests for stem.descriptor.networkstatus.
 """
 
 from __future__ import with_statement
@@ -256,8 +256,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w=
     self.assertEquals("27B6B5996C426270A5C95488AA5BCEB6BCC86956", desc.directory_signatures[0].identity)
     self.assertEquals("D5C30C15BB3F1DA27669C2D88439939E8F418FCF", desc.directory_signatures[0].key_digest)
     self.assertEquals(expected_signature, desc.directory_signatures[0].signature)
-
-class TestMicrodescriptorConsensus(unittest.TestCase):
+  
   def test_cached_microdesc_consensus(self):
     """
     Parses the cached-microdesc-consensus file in our data directory.