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

[bridgedb/develop] Add unittest explicitly for return type of parseBridgeExtraInfoFiles().
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Fix fingerprints in two tests for parseNetworkStatusFile().
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Add unittest for parseNetworkStatusFile() with two descriptors.
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Add test to check return of parseNetworkStatusFile() has `RouterStatusEntryV2`s.
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Change unittest to demand {(fpr, router), ...} is returned after deduplicate().
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Fix some docstring stylings in test_parse_descriptors.
by isis＠torproject.org 19 Feb '15

19 Feb '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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit d5b99328e07216159bc6933b5e37dcd6816693c1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 02:15:38 2015 +0000 Update translations for tails-misc --- sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv.po b/sv.po index d67a08c..90823b3 100644 --- a/sv.po +++ b/sv.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-11 22:08+0100\n" -"PO-Revision-Date: 2015-02-19 01:43+0000\n" +"PO-Revision-Date: 2015-02-19 01:50+0000\n" "Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit b5738e1ad47e800825de9f3ff55f25b63574ab0e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 02:15:10 2015 +0000 Update translations for torcheck --- sv/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index 5f8f42e..3429030 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-19 01:42+0000\n" +"PO-Revision-Date: 2015-02-19 01:50+0000\n" "Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 18da7cde439b6aaadf667d860b3ffad77a30e23b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 02:15:02 2015 +0000 Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 5722730..b8c4226 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-19 01:42+0000\n" +"PO-Revision-Date: 2015-02-19 01:50+0000\n" "Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit a4b6ac3f8bcecbbb0d6b7066d96aae3a61b46db8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 01:46:01 2015 +0000 Update translations for torbutton-torbuttonproperties --- sv/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/torbutton.properties b/sv/torbutton.properties index 5289a40..1c8a351 100644 --- a/sv/torbutton.properties +++ b/sv/torbutton.properties @@ -1,10 +1,10 @@ torbutton.button.tooltip.disabled = Aktivera Tor torbutton.button.tooltip.enabled = Inaktivera Tor torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.ip_unknown = Okänd IP-adress. torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.unknown_country = Okänt land torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor torbutton.panel.plugins.disabled = Klicka för att aktivera plugins

1 0