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

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

03 Mar '15

commit 210e534fe5745dcd0618b2ebc0e23e93d7e7a10e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 21:47:54 2015 +0000 Update translations for tails-misc --- sq.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sq.po b/sq.po index f9f3fec..a6b7733 100644 --- a/sq.po +++ b/sq.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-03 21:13+0000\n" +"PO-Revision-Date: 2015-03-03 21:45+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -312,18 +312,18 @@ msgstr "Karta e rrjetit ${nic} është paaftësuar" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "Rrengu nga MAC dështoi për kartën e rrjetit ${nic_name} (${nic}), ndaj është përkohësisht jashtë funksioni.\nNdoshta parapëlqeni të rinisni Tails dhe të paaftësoni rrengun nga MAC. Shihni <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentacionin</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 msgid "All networking disabled" -msgstr "" +msgstr "Të gjitha lidhjet në rrjet janë paaftësuar" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "Rrengu nga MAC dështoi për kartën e rrjetit ${nic_name} (${nic}). Po ashtu dështoi edhe rikuperimi i gabimit, kësisoj të gjitha lidhjet në rrjet janë paaftësuar.\nNdoshta parapëlqeni të rinisni Tails dhe të paaftësoni rrengun nga MAC. Shihni the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentacionin</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 @@ -346,7 +346,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "<b>Kujtesa e lirë s'është e mjaftueshme për të kontrolluar për përmirësime.</b>\n\nSigurohuni që ky sistem kënaq kërkesat për të ekzekutuar Tails.\nShihni skedarin:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPërpiquni të rinisni Tails, që të kërkoni sërish për përmirësime.\n\nOse bëni një përmirësim me dorë.\nShihni https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" @@ -429,13 +429,13 @@ msgstr "Një tjetër Shfletues i Pasigurt po ekzekutohet ose po pastrohet tani. msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." -msgstr "" +msgstr "NetworkManager na kaloi mbeturina të dhënash, kur përpiqej të deduktonte shërbyesin DNS clearnet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." -msgstr "" +msgstr "Asnjë shërbyes DNS në NetworkManager nuk është përftuar përmes DHCP, ose konfigurimit me dorë." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 msgid "Failed to setup chroot."

1 0

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

03 Mar '15

commit 74e985df8a73189ce16038af8688d88b7443de3b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 21:17:55 2015 +0000 Update translations for tails-misc --- sq.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sq.po b/sq.po index 4e7532c..f9f3fec 100644 --- a/sq.po +++ b/sq.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 15:53+0000\n" +"PO-Revision-Date: 2015-03-03 21:13+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -240,14 +240,14 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "" +msgstr "Sistemi i Drejtpërdrejtë e i Fshehur Amnesic " #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Informacioni mbi realizimin:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 @@ -266,7 +266,7 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "" +msgstr "Përmirësimi dështoi. Kjo mund të ketë ndodhur për shkak të një problemi të rrjetit. Ju lutemi kontrolloni lidhjen e rrjetit tuaj, provoni të rinisni Tails, ose lexoni regjistrin e sistemit, që ta kuptoni më mirë problemin." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." @@ -280,7 +280,7 @@ msgstr "Sinkronizimi i orës së sistemit" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "" +msgstr "Tor ka nevojë për një orë të saktë, që të punoj si duhet, veçanërisht për Shërbimet e Fshehta. Ju lutemi prisni..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -296,11 +296,11 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Duket sikur jeni penguar nga rrjeti. Kjo mund të jetë e lidhur me tiparin MAC për krijimin e rrengut. Për më shumë informacion, shihni <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">dokumentacionin e MAC mbi rrengun</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:151 msgid "This version of Tails has known security issues:" -msgstr "" +msgstr "Ky version i Tails ka probleme sigurie të njohura:" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 #, sh-format

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit 323ffd2188b0d973830735cb11464ea7d59e5986 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 18:47:47 2015 +0000 Update translations for torbirdy_completed --- fi/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd index 88d3d88..dfa4893 100644 --- a/fi/torbirdy.dtd +++ b/fi/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Universaali"> <!ENTITY torbirdy.prefs.imap.label "Ota käyttöön push-sähköpostituki IMAP-tileille [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty kansio käynnistyessä [oletus: pois käytöstä]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty sähköpostikansio käynnistyessä [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Älä aseta Thunderbirdin aikavyöhykettä UTC:ksi [oletus: aseta UTC:ksi]"> <!ENTITY torbirdy.prefs.timezone.key "p">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit e30c6592e68a23f88bc7840eecb5eb850cb5ae0a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 18:47:41 2015 +0000 Update translations for torbirdy --- fi/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd index 88d3d88..dfa4893 100644 --- a/fi/torbirdy.dtd +++ b/fi/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Universaali"> <!ENTITY torbirdy.prefs.imap.label "Ota käyttöön push-sähköpostituki IMAP-tileille [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty kansio käynnistyessä [oletus: pois käytöstä]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Valitse viimeksi käytetty sähköpostikansio käynnistyessä [oletus: pois käytöstä]"> <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Älä aseta Thunderbirdin aikavyöhykettä UTC:ksi [oletus: aseta UTC:ksi]"> <!ENTITY torbirdy.prefs.timezone.key "p">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit da3c4909c100cbccafe5fa173c2c8ee4c88a7574 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 18:15:23 2015 +0000 Update translations for bridgedb_completed --- fi/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po index 4f71f41..a2afaa5 100644 --- a/fi/LC_MESSAGES/bridgedb.po +++ b/fi/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-03-03 17:41+0000\n" +"PO-Revision-Date: 2015-03-03 18:01+0000\n" "Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa kiertämään internet-sensuuria monissa tapauksissa.\n" +msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -152,7 +152,7 @@ msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoittees #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Siltani ei toimi! Tarvitsen apua!" +msgstr "Siltani eivät toimi! Tarvitsen apua!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -184,7 +184,7 @@ msgstr "Valitse valitsimet siltatyypille:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Tarvitsetko IPv6 osoitteita?" +msgstr "Tarvitsetko IPv6-osoitteita?" #: lib/bridgedb/strings.py:110 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit d384fb792f58ab74cf9e8a7de3108d41e08b6335 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 18:15:03 2015 +0000 Update translations for bridgedb --- fi/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po index 4f71f41..a2afaa5 100644 --- a/fi/LC_MESSAGES/bridgedb.po +++ b/fi/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-03-03 17:41+0000\n" +"PO-Revision-Date: 2015-03-03 18:01+0000\n" "Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa kiertämään internet-sensuuria monissa tapauksissa.\n" +msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -152,7 +152,7 @@ msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoittees #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Siltani ei toimi! Tarvitsen apua!" +msgstr "Siltani eivät toimi! Tarvitsen apua!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -184,7 +184,7 @@ msgstr "Valitse valitsimet siltatyypille:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Tarvitsetko IPv6 osoitteita?" +msgstr "Tarvitsetko IPv6-osoitteita?" #: lib/bridgedb/strings.py:110 #, python-format

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit 45e837046a159780544d10bf5a39de0def0cbabf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 17:45:23 2015 +0000 Update translations for bridgedb_completed --- fi/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po index d0ed05d..4f71f41 100644 --- a/fi/LC_MESSAGES/bridgedb.po +++ b/fi/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 # Spacha <miikasikala96(a)gmail.com>, 2015 # Ossi Kallunki <ossikallunki(a)gmail.com>, 2013 @@ -14,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-25 20:42+0000\n" +"PO-Revision-Date: 2015-03-03 17:41+0000\n" "Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -52,7 +53,7 @@ msgstr "Tässä ovat sinun siltasi." msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan jälkeen ohitetaan." +msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan." #: lib/bridgedb/strings.py:25 msgid ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Mar '15

03 Mar '15

commit 97626211b0ee3c0c0a6a1065a147d5b29e08204b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 3 17:45:03 2015 +0000 Update translations for bridgedb --- fi/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po index d0ed05d..4f71f41 100644 --- a/fi/LC_MESSAGES/bridgedb.po +++ b/fi/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 # Spacha <miikasikala96(a)gmail.com>, 2015 # Ossi Kallunki <ossikallunki(a)gmail.com>, 2013 @@ -14,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-25 20:42+0000\n" +"PO-Revision-Date: 2015-03-03 17:41+0000\n" "Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -52,7 +53,7 @@ msgstr "Tässä ovat sinun siltasi." msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan jälkeen ohitetaan." +msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan." #: lib/bridgedb/strings.py:25 msgid ""

1 0

[stem/master] Simplifying _get_tests()
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 6a9c9a63b81c12679751f4c73e76fcc964680742 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 08:47:27 2015 -0800 Simplifying _get_tests() Our module_prefixes fall into two camps... * It's... well, a module prefix. It'll be a prefix of our import name. * It's an exact match for a test. Our import name will be a prefix of it. No need to strip off the last component and try again. We can do this in one pass. One thing I noticed though is that we don't check to see if tests exist. We rely on a try/catch for that. Might be able to wrap it into this helper - we'll see. --- test/util.py | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/test/util.py b/test/util.py index 78be64b..35909e5 100644 --- a/test/util.py +++ b/test/util.py @@ -108,33 +108,18 @@ def get_integ_tests(module_prefix = None): def _get_tests(modules, module_prefix): - # Look for module_prefix in the list of all modules - modules_found = 0 for import_name in modules: if import_name: - if module_prefix and not import_name.startswith(module_prefix): - continue + if not module_prefix or import_name.startswith(module_prefix): + yield import_name + elif module_prefix.startswith(import_name): + # might be a single test in this module, check if we match any + + module, test = module_prefix.rsplit('.', 1) + + # TODO: should check if the test exists - modules_found += 1 - yield import_name - - # If no modules were found, then it might be that we were given - # a method (e.g test.integ.process.some_method). - # Delete the method substring and look again in the list of modules - if modules_found == 0: - module_list = module_prefix.split('.') - # At this point all module_prefix should be test.{integ|unit}.something - if(len(module_list) > 3): - module_prefix = '.'.join(module_list[:-1]) - class_method = module_list[-1] - - for import_name in modules: - if import_name: - if module_prefix and not import_name.startswith(module_prefix): - continue - - # If found, return module.method - yield import_name + '.' + class_method + yield module_prefix def get_help_message():

1 0

[stem/master] Didn't account for test modules citing the class
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 3263d5bd94e79f68c91c4ff27244878c5483d032 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 09:23:13 2015 -0800 Didn't account for test modules citing the class Oops! Didn't catch that the test modules include the class. For example... test.unit.util.conf.TestConf.test_parse_enum_csv civ's original patch did, though he surfaced it in our output which caused our test names to be a lot longer. Changing us back so we hide it. --- run_tests.py | 18 ++++++++++++------ test/util.py | 8 +++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 3af6d31..8e2b8f2 100755 --- a/run_tests.py +++ b/run_tests.py @@ -445,12 +445,18 @@ def _run_test(args, test_class, output_filters, logging_buffer): if args.verbose: test.output.print_divider(test_class) else: - label = test_class - - if label.startswith('test.unit.'): - label = label[10:] - elif label.startswith('test.integ.'): - label = label[11:] + # Test classes look like... + # + # test.unit.util.conf.TestConf.test_parse_enum_csv + # + # We want to strip the 'test.unit.' or 'test.integ.' prefix since it's + # redundant. We also want to drop the test class name. The individual test + # name at the end it optional (only present if we used the '--test' + # argument). + + label_comp = test_class.split('.')[2:] + del label_comp[-1 if label_comp[-1][0].isupper() else -2] + label = '.'.join(label_comp) label = ' %s...' % label label = '%-54s' % label diff --git a/test/util.py b/test/util.py index 35909e5..eb8b5eb 100644 --- a/test/util.py +++ b/test/util.py @@ -110,16 +110,18 @@ def get_integ_tests(module_prefix = None): def _get_tests(modules, module_prefix): for import_name in modules: if import_name: - if not module_prefix or import_name.startswith(module_prefix): + module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf + + if not module_prefix or module.startswith(module_prefix): yield import_name - elif module_prefix.startswith(import_name): + elif module_prefix.startswith(module): # might be a single test in this module, check if we match any module, test = module_prefix.rsplit('.', 1) # TODO: should check if the test exists - yield module_prefix + yield '%s.%s' % (import_name, test) def get_help_message():

1 0