- tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit a3116bb12fded200426154651482c9a9d4f655d0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 01:45:09 2012 +0000 Update translations for orbot --- values-pt_BR/strings.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml index f7579bc..eac06f6 100644 --- a/values-pt_BR/strings.xml +++ b/values-pt_BR/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">Parar</string> <string name="menu_about">Sobre</string> <string name="menu_wizard">Assistente</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> <string name="button_help">Ajuda</string> <string name="button_close">Fechar</string> <string name="button_about">Sobre</string> @@ -72,6 +74,12 @@ <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string> <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string> + <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Aplicativo Proxy Mobile para Firefox (http://tinyurl.com/getproxymob)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configurações de Proxy</string> <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n\n As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.\n \n\n\n Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot está pronto!</string> @@ -100,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit 6d78b37a6e22c5400edebb36b9aa61b123530e9e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 01:16:02 2012 +0000 Update translations for torbirdy_completed --- pt_BR/torbirdy.dtd | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd new file mode 100644 index 0000000..6eb13d9 --- /dev/null +++ b/pt_BR/torbirdy.dtd @@ -0,0 +1,42 @@ +<!ENTITY torbirdy.accountprefs.title "Configurações da Conta"> +<!ENTITY torbirdy.accountprefs.startup.label "Verifique se há novas mensagens ao iniciar"> +<!ENTITY torbirdy.accountprefs.startup.key "I"> +<!ENTITY torbirdy.accountprefs.minutes.label "Verificar se há novas mensagens a cada"> +<!ENTITY torbirdy.accountprefs.minutes.key "a"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos"> +<!ENTITY torbirdy.accountprefs.cancel.button "Cancelar"> +<!ENTITY torbirdy.accountprefs.save.button "Salvar"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "Preferências"> +<!ENTITY torbirdy.prefs.save.button "Salvar"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Cancelar"> +<!ENTITY torbirdy.prefs.extra2.button "Testar Configurações"> +<!ENTITY torbirdy.prefs.extra2.key "c"> +<!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade"> +<!ENTITY torbirdy.prefs.recommended.text "Utilize as configurações de proxy recomendadas pelo TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimação"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Usar configurações de proxy personalizadas"> +<!ENTITY torbirdy.prefs.customsettings.key "p"> +<!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:"> +<!ENTITY torbirdy.prefs.socks_host.key "s"> +<!ENTITY torbirdy.prefs.socks_port.label "Porta:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Torificação Transparente"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Geral"> +<!ENTITY torbirdy.prefs.imap.label "Habilitar suporte a download de emails via IMAP [padrão: desativado]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "Abrir a última pasta acessada ao iniciar [padrão: desativado, será selecionada a Pasta Local]"> +<!ENTITY torbirdy.prefs.startup_folder.key "p"> +<!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso-hotário do Thunderbird para UTC [padrão: definido para UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "f"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Colocar o ID do destinatário em mensagens criptografadas [padrão: não colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "l"> +<!ENTITY torbirdy.prefs.account_specific "Configurações da Conta"> +<!ENTITY torbirdy.prefs.select_account.key "s"> +<!ENTITY torbirdy.prefs.select_account.label "Escolha uma conta:">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit f5396ad661419b341a563fd89272c8b455464cd5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 01:16:00 2012 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd new file mode 100644 index 0000000..6eb13d9 --- /dev/null +++ b/pt_BR/torbirdy.dtd @@ -0,0 +1,42 @@ +<!ENTITY torbirdy.accountprefs.title "Configurações da Conta"> +<!ENTITY torbirdy.accountprefs.startup.label "Verifique se há novas mensagens ao iniciar"> +<!ENTITY torbirdy.accountprefs.startup.key "I"> +<!ENTITY torbirdy.accountprefs.minutes.label "Verificar se há novas mensagens a cada"> +<!ENTITY torbirdy.accountprefs.minutes.key "a"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos"> +<!ENTITY torbirdy.accountprefs.cancel.button "Cancelar"> +<!ENTITY torbirdy.accountprefs.save.button "Salvar"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "Preferências"> +<!ENTITY torbirdy.prefs.save.button "Salvar"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Cancelar"> +<!ENTITY torbirdy.prefs.extra2.button "Testar Configurações"> +<!ENTITY torbirdy.prefs.extra2.key "c"> +<!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade"> +<!ENTITY torbirdy.prefs.recommended.text "Utilize as configurações de proxy recomendadas pelo TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimação"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Usar configurações de proxy personalizadas"> +<!ENTITY torbirdy.prefs.customsettings.key "p"> +<!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:"> +<!ENTITY torbirdy.prefs.socks_host.key "s"> +<!ENTITY torbirdy.prefs.socks_port.label "Porta:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Torificação Transparente"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Geral"> +<!ENTITY torbirdy.prefs.imap.label "Habilitar suporte a download de emails via IMAP [padrão: desativado]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "Abrir a última pasta acessada ao iniciar [padrão: desativado, será selecionada a Pasta Local]"> +<!ENTITY torbirdy.prefs.startup_folder.key "p"> +<!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso-hotário do Thunderbird para UTC [padrão: definido para UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "f"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Colocar o ID do destinatário em mensagens criptografadas [padrão: não colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "l"> +<!ENTITY torbirdy.prefs.account_specific "Configurações da Conta"> +<!ENTITY torbirdy.prefs.select_account.key "s"> +<!ENTITY torbirdy.prefs.select_account.label "Escolha uma conta:">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit 8a9084524f4b6cc607f2ecae6e3bc350d673cbf8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 01:15:56 2012 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index d51b244..faaebcb 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <geronimo.bruno(a)gmail.com>, 2012. # <rafaelmartinsrm(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-10-03 16:16+0200\n" -"PO-Revision-Date: 2012-10-15 05:53+0000\n" -"Last-Translator: NICEcookie <rafaelmartinsrm(a)gmail.com>\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-12-10 01:15+0000\n" +"Last-Translator: bruuh <geronimo.bruno(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,26 +76,34 @@ msgid "Configuration of network devices and connections" msgstr "Configuração de dispositivos de rede e conexões" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Favoritos" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Favorito armazenado no Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" msgstr "Pacotes APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Packages downloaded by APT" msgstr "Pacotes baixados pelo APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Lists" msgstr "Listas APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Lists downloaded by APT" msgstr "Listas baixadas pelo APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "Dotfiles" msgstr "Arquivos de configuração (dotfiles)" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Criar um link em $HOME para todos os arquivos ou diretórios encontrados no diretório `dotfiles`" @@ -193,8 +202,8 @@ msgstr "Escolha uma senha para proteger o volume persistente" #, perl-format msgid "" "A %s persistent volume will be created on the %s %s device. Data on " -"this device will be stored in an encrypted form protected by a passphrase." -msgstr "Um volume persistente %s vai ser criado no dispositivo %s %s. Dados neste dispositivo serão armazenados de forma criptografada protegidos por uma senha." +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Um volume persistente %s vai ser criado no dispositivo %s %s. Os dados deste dispositivo serão armazenados de forma criptografada protegidos por uma senha." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit 765a897ee957f44860388c3a70539f9dce44748f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 01:15:52 2012 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 483ebb1..faaebcb 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <geronimo.bruno(a)gmail.com>, 2012. # <rafaelmartinsrm(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-11-28 09:09+0000\n" -"Last-Translator: NICEcookie <rafaelmartinsrm(a)gmail.com>\n" +"PO-Revision-Date: 2012-12-10 01:15+0000\n" +"Last-Translator: bruuh <geronimo.bruno(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +77,11 @@ msgstr "Configuração de dispositivos de rede e conexões" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Favoritos" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Favorito armazenado no Iceweasel" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -202,7 +203,7 @@ msgstr "Escolha uma senha para proteger o volume persistente" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "Um volume persistente %s vai ser criado no dispositivo %s %s. Os dados deste dispositivo serão armazenados de forma criptografada protegidos por uma senha." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0

[stem/master] Improve tests for close_circuit exceptions
by atagar＠torproject.org 09 Dec '12

09 Dec '12

commit a8b20adb7044971935380b4170254c1c2d7f2051 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 9 08:37:54 2012 -0700 Improve tests for close_circuit exceptions Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 56558ea..b2a9ffd 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -518,7 +518,8 @@ class TestController(unittest.TestCase): self.assertFalse(circ_id in circ) circ_id = controller.new_circuit() - self.assertRaises(stem.InvalidRequest, controller.close_circuit, circ_id + 1024) + self.assertRaises(stem.InvalidArguments, controller.close_circuit, circ_id + 1024) + self.assertRaises(stem.InvalidRequest, controller.close_circuit, "") def test_mapaddress(self): if test.runner.require_control(self): return

1 0

[stem/master] Raise different exceptions for different CLOSECIRCUIT errors
by atagar＠torproject.org 09 Dec '12

09 Dec '12

commit b3fe1659c0d2c7bf7c8ce282e0f858eb6350e80e Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:57:13 2012 -0700 Raise different exceptions for different CLOSECIRCUIT errors Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8d9784e..3572987 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1462,7 +1462,8 @@ class Controller(BaseController): :param str flag: optional value to modify closing, the only flag available is "IfUnused" which will not close the circuit unless it is unused - :raises: :class:`stem.InvalidArguments` if the circuit doesn't exist or not enough information is provided + :raises: :class:`stem.InvalidArguments` if the circuit is unknown + :raises: :class:`stem.InvalidRequest` if not enough information is provided """ response = self.msg("CLOSECIRCUIT %s %s"% (str(circuit_id), flag)) @@ -1470,6 +1471,8 @@ class Controller(BaseController): if not response.is_ok(): if response.code in ('512', '552'): + if response.message.startswith("Unknown circuit "): + raise stem.InvalidArguments(response.code, response.message, [circuit_id]) raise stem.InvalidRequest(response.code, response.message) else: raise stem.ProtocolError("CLOSECIRCUIT returned unexpected response code: %s" % response.code)

1 0

[stem/master] Testing event version requirement checks
by atagar＠torproject.org 09 Dec '12

09 Dec '12

commit ec13ebb581fc7b57f055c59934f5f7f41c2111bb Merge: 4cacd2f 3be3a8d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 13:54:20 2012 -0800 Testing event version requirement checks Patches by robinson to both fix the mock_method() function and use it to test the tor version requirement checks for events. event version check: https://trac.torproject.org/7674 mock_method() fix: https://trac.torproject.org/7686 test/mocking.py | 26 +++++++++++++++++++------- test/unit/control/controller.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 9 deletions(-)

1 0

[stem/master] Minor revisions for the new add_event_listener tests
by atagar＠torproject.org 09 Dec '12

09 Dec '12

commit 3be3a8d94bb666b56bdc65e732f83c88ccfe0a15 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 13:52:20 2012 -0800 Minor revisions for the new add_event_listener tests Just some minor tweaks... * Replaced 'lambda x: x' with 'mocking.no_op()'. * Dropped the 'assertIsNone()' call. The purpose of this line is to make sure that add_event_listener() doesn't raise an exception, not to make an assertion on what the function returns. * Minor import tweaks to conform with 3da47d3. --- test/unit/control/controller.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index a9d31d1..400d795 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -5,11 +5,12 @@ integ tests, but a few bits lend themselves to unit testing. import unittest -from stem import InvalidRequest, ProtocolError -from stem.control import _parse_circ_path, Controller, EventType import stem.socket import stem.version -import test.mocking as mocking + +from stem import InvalidRequest, ProtocolError +from stem.control import _parse_circ_path, Controller, EventType +from test import mocking class TestControl(unittest.TestCase): def setUp(self): @@ -65,12 +66,14 @@ class TestControl(unittest.TestCase): # set up for failure to create any events mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.1.0.14'))) - self.assertRaises(InvalidRequest, self.controller.add_event_listener, lambda x: x, EventType.BW) + self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.BW) # set up to only fail newer events mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.2.0.35'))) + # EventType.BW is one of the earliest events - self.assertIsNone(self.controller.add_event_listener(lambda x: x, EventType.BW)) + self.controller.add_event_listener(mocking.no_op(), EventType.BW) + # EventType.SIGNAL was added in tor version 0.2.3.1-alpha - self.assertRaises(InvalidRequest, self.controller.add_event_listener, lambda x: x, EventType.SIGNAL) + self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.SIGNAL)

1 0

[stem/master] Add version requirement tests for Controller.add_event_listener
by atagar＠torproject.org 09 Dec '12

09 Dec '12

commit f5e2d127581a487f9cba7edf86943c0f78445180 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 18:29:54 2012 -0700 Add version requirement tests for Controller.add_event_listener Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/control/controller.py | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index e25fbe0..a9d31d1 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -5,10 +5,20 @@ integ tests, but a few bits lend themselves to unit testing. import unittest -from stem import ProtocolError -from stem.control import _parse_circ_path +from stem import InvalidRequest, ProtocolError +from stem.control import _parse_circ_path, Controller, EventType +import stem.socket +import stem.version +import test.mocking as mocking class TestControl(unittest.TestCase): + def setUp(self): + socket = stem.socket.ControlSocket() + self.controller = Controller(socket) + + def tearDown(self): + mocking.revert_mocking() + def test_parse_circ_path(self): """ Exercises the _parse_circ_path() helper function. @@ -47,4 +57,20 @@ class TestControl(unittest.TestCase): for test_input in malformed_inputs: self.assertRaises(ProtocolError, _parse_circ_path, test_input) + + def test_event_listening(self): + """ + Exercises the add_event_listener and remove_event_listener methods. + """ + + # set up for failure to create any events + mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.1.0.14'))) + self.assertRaises(InvalidRequest, self.controller.add_event_listener, lambda x: x, EventType.BW) + + # set up to only fail newer events + mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.2.0.35'))) + # EventType.BW is one of the earliest events + self.assertIsNone(self.controller.add_event_listener(lambda x: x, EventType.BW)) + # EventType.SIGNAL was added in tor version 0.2.3.1-alpha + self.assertRaises(InvalidRequest, self.controller.add_event_listener, lambda x: x, EventType.SIGNAL)

1 0