March 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Add unittest for parseNetworkStatusFile() with two descriptors.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 890433aece9961e3f93d6061942a77f79c221815 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 02:00:12 2014 +0000 Add unittest for parseNetworkStatusFile() with two descriptors. --- lib/bridgedb/test/test_parse_descriptors.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index da8078c..0ad54aa 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -38,6 +38,14 @@ w Bandwidth=1902273 p reject 1-65535 ''' +BRIDGE_NETWORKSTATUS_1 = '''\ +r Reestablishes jPqMRoqkH62eLMXl76DqIddlpto 2BETKn1sOghC6coUkCSq/9mvPNM 2014-08-20 19:52:41 25.178.4.186 32324 0 +a [d7b3:8c3e:186a:d65f:706:cbfd:8512:fd1]:32324 +s Fast Guard Running Stable Valid +w Bandwidth=497963 +p reject 1-65535 +''' + BRIDGE_SERVER_DESCRIPTOR = '''\ router OutwitsPlod 152.78.9.20 17810 0 0 or-address [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 @@ -194,6 +202,22 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + def test_parse_descriptors_parseBridgeNetworkStatusFile_two_files(self): + """Test ``b.p.descriptors.parseNetworkStatusFile`` with two bridge + networkstatus descriptors. + """ + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + BRIDGE_NETWORKSTATUS_0, + BRIDGE_NETWORKSTATUS_1) + routers = descriptors.parseNetworkStatusFile(descFile) + bridge = routers.items()[0] + self.assertIsInstance(bridge, RouterStatusEntryV2) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one bridge extrainfo file."""

1 0

[bridgedb/master] Change unittest to demand {(fpr, router), ...} is returned after deduplicate().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 1650ff00c97f9e39afdcdfefa08741cffbb70163 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:55:55 2014 +0000 Change unittest to demand {(fpr, router),...} is returned after deduplicate(). --- lib/bridgedb/test/test_parse_descriptors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 6a44895..85863e4 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -231,11 +231,11 @@ class ParseDescriptorsTests(unittest.TestCase): def test_parse_descriptors_parseBridgeExtraInfoFiles_return_type(self): """The return type of ``b.p.descriptors.parseBridgeExtraInfoFiles`` - should be a list. + should be a dictionary (after deduplication). """ descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) - self.assertIsInstance(routers, list) + self.assertIsInstance(routers, dict) def test_parse_descriptors_parseBridgeExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): """The return of ``b.p.descriptors.parseBridgeExtraInfoFiles`` should

1 0

[bridgedb/master] Fix faulty unittests which expected parsed extrainfos to have an `address`.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 41f0f5c255740d777764fa7a336769c317b0cc26 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:57:35 2014 +0000 Fix faulty unittests which expected parsed extrainfos to have an `address`. --- lib/bridgedb/test/test_parse_descriptors.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 85863e4..2a1171e 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -253,7 +253,7 @@ class ParseDescriptorsTests(unittest.TestCase): descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) bridge = routers.values()[0] - self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(len(bridge.transport), 2) self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') @@ -266,6 +266,5 @@ class ParseDescriptorsTests(unittest.TestCase): descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) bridge = routers.values()[0] - self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/master] Add unittest explicitly for return type of parseBridgeExtraInfoFiles().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 75ab626e39474eba43a045a6110acf513bfe9410 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 02:01:18 2014 +0000 Add unittest explicitly for return type of parseBridgeExtraInfoFiles(). --- lib/bridgedb/test/test_parse_descriptors.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 0ad54aa..e38b9fe 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -218,12 +218,19 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + def test_parse_descriptors_parseBridgeExtraInfoFiles_return_type(self): + """The return type of ``b.p.descriptors.parseBridgeExtraInfoFiles`` + should be a list. + """ + descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseBridgeExtraInfoFiles(descFile) + self.assertIsInstance(routers, list) + def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one bridge extrainfo file.""" descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) - self.assertIsInstance(routers, list) bridge = routers[0] self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) self.assertEqual(bridge.address, u'152.78.9.20') @@ -237,7 +244,6 @@ class ParseDescriptorsTests(unittest.TestCase): descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) - self.assertIsInstance(routers, list) bridge = routers[0] self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) self.assertEqual(bridge.address, u'152.78.9.20')

1 0

[bridgedb/master] Add test to check return of parseNetworkStatusFile() has `RouterStatusEntryV2`s.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 41ff4999a08328d235e65b4c858c36db5b76598b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 02:38:15 2014 +0000 Add test to check return of parseNetworkStatusFile() has `RouterStatusEntryV2`s. --- lib/bridgedb/test/test_parse_descriptors.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index e38b9fe..6076de0 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -187,7 +187,20 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseNetworkStatusFile(descFile) self.assertIsInstance(routers, dict) - def test_parse_descriptors_parseBridgeNetworkStatusFile_one_file(self): + def test_parse_descriptors_parseBridgeNetworkStatusFile_has_RouterStatusEntryV2(self): + """The items in the dict returned from + ``b.p.descriptors.parseNetworkStatusFile`` should be + ``RouterStatusEntryV2``s. + """ + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + BRIDGE_NETWORKSTATUS_0) + routers = descriptors.parseNetworkStatusFile(descFile) + fingerprint, bridge = routers.items()[0] + self.assertIsInstance(bridge, RouterStatusEntryV2) + + def test_parse_descriptors_parseBridgeNetworkStatusFile_1(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with one bridge networkstatus descriptor. """ @@ -202,7 +215,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') - def test_parse_descriptors_parseBridgeNetworkStatusFile_two_files(self): + def test_parse_descriptors_parseBridgeNetworkStatusFile_2(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with two bridge networkstatus descriptors. """

1 0

[bridgedb/master] Add another unittest for parseBridgeExtraInfoFiles() return type.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6700f6b7f15fd3d8fe964fd3a16f64b96d455d02 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:44:57 2014 +0000 Add another unittest for parseBridgeExtraInfoFiles() return type. --- lib/bridgedb/test/test_parse_descriptors.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index fae6441..9cb4b91 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -237,13 +237,21 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseBridgeExtraInfoFiles(descFile) self.assertIsInstance(routers, list) + def test_parse_descriptors_parseBridgeExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): + """The return of ``b.p.descriptors.parseBridgeExtraInfoFiles`` should + contain ``BridgeExtraInfoDescriptor``s. + """ + descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseBridgeExtraInfoFiles(descFile) + bridge = routers.values()[0] + self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one bridge extrainfo file.""" descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) - bridge = routers[0] - self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + bridge = routers.values()[0] self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') @@ -255,8 +263,7 @@ class ParseDescriptorsTests(unittest.TestCase): descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) - bridge = routers[0] - self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + bridge = routers.values()[0] self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/master] Fix some docstring stylings in test_parse_descriptors.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 9611f5d08fa599c6e022afb010a1cf974f44adee Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:55:14 2014 +0000 Fix some docstring stylings in test_parse_descriptors. --- lib/bridgedb/test/test_parse_descriptors.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 9cb4b91..6a44895 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -248,7 +248,8 @@ class ParseDescriptorsTests(unittest.TestCase): def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one - bridge extrainfo file.""" + bridge extrainfo file. + """ descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) bridge = routers.values()[0] @@ -259,7 +260,8 @@ class ParseDescriptorsTests(unittest.TestCase): def test_parse_descriptors_parseBridgeExtraInfoFiles_two_files(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with two bridge extrainfo files, and check that only the newest extrainfo - descriptor is used.""" + descriptor is used. + """ descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo)

1 0

[bridgedb/master] Fix fingerprints in two tests for parseNetworkStatusFile().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 1cb15d01fa107467b811eca7e3ebd17f3a31ecf9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 02:42:10 2014 +0000 Fix fingerprints in two tests for parseNetworkStatusFile(). --- lib/bridgedb/test/test_parse_descriptors.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 6076de0..fae6441 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -209,10 +209,9 @@ class ParseDescriptorsTests(unittest.TestCase): descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', BRIDGE_NETWORKSTATUS_0) routers = descriptors.parseNetworkStatusFile(descFile) - bridge = routers.items()[0] - self.assertIsInstance(bridge, RouterStatusEntryV2) + fingerprint, bridge = routers.items()[0] self.assertEqual(bridge.address, u'152.78.9.20') - self.assertEqual(bridge.fingerprint, + self.assertEqual(fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') def test_parse_descriptors_parseBridgeNetworkStatusFile_2(self): @@ -225,10 +224,9 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_NETWORKSTATUS_0, BRIDGE_NETWORKSTATUS_1) routers = descriptors.parseNetworkStatusFile(descFile) - bridge = routers.items()[0] - self.assertIsInstance(bridge, RouterStatusEntryV2) + fingerprint, bridge = routers.items()[0] self.assertEqual(bridge.address, u'152.78.9.20') - self.assertEqual(bridge.fingerprint, + self.assertEqual(fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') def test_parse_descriptors_parseBridgeExtraInfoFiles_return_type(self):

1 0

[bridgedb/master] This test was supposed to test deduplication. Now it does.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 65f18cd7c31a97274a8277688f0512b69ac1e3e3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:58:28 2014 +0000 This test was supposed to test deduplication. Now it does. --- lib/bridgedb/test/test_parse_descriptors.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 2a1171e..b947a39 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -265,6 +265,5 @@ class ParseDescriptorsTests(unittest.TestCase): descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) - bridge = routers.values()[0] - self.assertEqual(bridge.fingerprint, - u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + # We shouldn't have duplicates: + self.assertEqual(len(routers), 1)

1 0

[bridgedb/master] Add more info to docstring for `b.p.descriptors.parseBridgeExtraInfoFiles()`.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 1e4de24ac711dbcbe6b1992da951a90ee64c2e8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 04:00:27 2014 +0000 Add more info to docstring for `b.p.descriptors.parseBridgeExtraInfoFiles()`. --- lib/bridgedb/parse/descriptors.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 939ecb0..ab0d37f 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -141,9 +141,15 @@ def deduplicate(descriptors): def parseBridgeExtraInfoFiles(*filenames, **kwargs): """Parse files which contain ``@type bridge-extrainfo-descriptor``s. - :kwargs: If there is a ``'validate'`` keyword argument, its value will be - passed along as the ``'validate'`` argument to + .. note:: This function will call :func:`deduplicate` to deduplicate the + extrainfo descriptors parsed from all **filenames**. + + :kwargs validate: If there is a ``'validate'`` keyword argument, its value + will be passed along as the ``'validate'`` argument to :api:`stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`. + :rtype: dict + :returns: A dictionary mapping bridge fingerprints to deduplicated + :api:`stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`s. """ descriptors = [] descriptorType = 'bridge-extra-info 1.1'

1 0