[tor-commits] [bridgedb/develop] Add unittests for Bridge.updateFrom*(ignoreNetworkstatus=True).

[isis at torproject.org]

commit f128f46de25361ec51341f850b1fc43de06cbf2b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Apr 22 01:25:42 2015 +0000

    Add unittests for Bridge.updateFrom*(ignoreNetworkstatus=True).
---
 lib/bridgedb/test/test_bridges.py |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py
index 5a79d5e..7778b02 100644
--- a/lib/bridgedb/test/test_bridges.py
+++ b/lib/bridgedb/test/test_bridges.py
@@ -1029,6 +1029,25 @@ class BridgeTests(unittest.TestCase):
         self.assertIn((ipaddr.IPAddress('123.34.56.78'), 36488, 4),
                       self.bridge.allVanillaAddresses)
 
+    def test_Bridge_updateFromNetworkStatus_ignoreNetworkstatus(self):
+        """Calling updateFromNetworkStatus([…], ignoreNetworkstatus=True)
+        should update the Bridge's flags, its fingerprint, and its
+        descriptorDigest, and nothing else.
+        """
+        self.bridge.updateFromNetworkStatus(self.networkstatus,
+                                            ignoreNetworkstatus=True)
+
+        self.assertTrue(self.bridge.flags.running)
+        self.assertTrue(self.bridge.flags.stable)
+        self.assertIsNotNone(self.bridge.descriptorDigest)
+        self.assertEqual(self.bridge.fingerprint,
+                         '2C3225C4805331025E211F4B6E5BF45C333FDD2C')
+
+        self.assertIsNone(self.bridge.nickname)
+        self.assertIsNone(self.bridge.address)
+        self.assertIsNone(self.bridge.orPort)
+        self.assertIsNone(self.bridge.orPort)
+
     def test_Bridge_updateFromServerDescriptor(self):
         """ """
         self.bridge.updateFromNetworkStatus(self.networkstatus)
@@ -1046,6 +1065,16 @@ class BridgeTests(unittest.TestCase):
                           self.bridge.updateFromServerDescriptor,
                           self.serverdescriptor)
 
+    def test_Bridge_updateFromServerDescriptor_ignoreNetworkstatus_no_networkstatus(self):
+        """Parsing a server descriptor for a bridge which wasn't included in
+        the networkstatus document from the BridgeAuthority, when
+        ignoreNetworkstatus=True, should not raise any warnings.
+        """
+        self.bridge.updateFromServerDescriptor(self.serverdescriptor,
+                                               ignoreNetworkstatus=True)
+        self.assertIsNone(self.bridge.descriptors['networkstatus'])
+        self.assertIsNotNone(self.bridge.descriptors['server'])
+
     def test_Bridge_verifyExtraInfoSignature_good_signature(self):
         """Calling _verifyExtraInfoSignature() with a descriptor which has a
         good signature should return None.