- tor-commits - lists.torproject.org

[stem/master] Removing CALL_MOCKING from the system module
by atagar＠torproject.org 30 Jan '12

30 Jan '12

commit f7d18618e20b440b0efaccb6f4a5786842700f9c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 17:35:28 2012 -0800 Removing CALL_MOCKING from the system module While writing the unit and integ tests I realized that the tests could be greatly simplified by adding an override function called 'CALL_MOCKING' that would let the tests modify the call function's behavior. This was a mistake. Production code should be designed to make testing easy because this leads to better production code, but adding hacks that are only useful for testing is bad. Now that we have a nice mocking module the CALL_MOCKING hack is no longer necessary so removing it. --- stem/util/system.py | 61 +++++++++++--------------------------------------- 1 files changed, 14 insertions(+), 47 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index f58f698..1a85dc8 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -23,16 +23,6 @@ import subprocess import stem.util.proc import stem.util.log as log -# Functor for mocking the call function, which should either return a string -# (or None) to emulate responses, or a boolean to indicate if we should filter -# the call. Also, when set... -# - we don't check that commands exist before calling them -# - the use of proc functions is disabled -# -# This is intended for testing purposes only. - -CALL_MOCKING = None - # Mapping of commands to if they're available or not. This isn't always # reliable, failing for some special commands. For these the cache is # prepopulated to skip lookups. @@ -121,7 +111,7 @@ def is_running(command): # -o ucomm= - Shows just the ucomm attribute ("name to be used for # accounting") - if CALL_MOCKING or is_available("ps"): + if is_available("ps"): if is_bsd(): primary_resolver = IS_RUNNING_PS_BSD secondary_resolver = IS_RUNNING_PS_LINUX @@ -166,7 +156,7 @@ def get_pid_by_name(process_name): # 3283 # 3392 - if CALL_MOCKING or is_available("pgrep"): + if is_available("pgrep"): results = call(GET_PID_BY_NAME_PGREP % process_name) if results and len(results) == 1: @@ -180,7 +170,7 @@ def get_pid_by_name(process_name): # atagar@morrigan:~$ pidof vim # 3392 3283 - if CALL_MOCKING or is_available("pidof"): + if is_available("pidof"): results = call(GET_PID_BY_NAME_PIDOF % process_name) if results and len(results) == 1 and len(results[0].split()) == 1: @@ -203,8 +193,8 @@ def get_pid_by_name(process_name): # 11 ?? Ss 5:47.36 DirectoryService # 12 ?? Ss 3:01.44 notifyd - if CALL_MOCKING or is_available("ps"): - if CALL_MOCKING or not is_bsd(): + if is_available("ps"): + if not is_bsd(): # linux variant of ps results = call(GET_PID_BY_NAME_PS_LINUX % process_name) @@ -212,7 +202,7 @@ def get_pid_by_name(process_name): pid = results[1].strip() if pid.isdigit(): return int(pid) - if CALL_MOCKING or is_bsd(): + if is_bsd(): # bsd variant of ps results = call(GET_PID_BY_NAME_PS_BSD) @@ -238,7 +228,7 @@ def get_pid_by_name(process_name): # 2470 # 2561 - if CALL_MOCKING or is_available("lsof"): + if is_available("lsof"): results = call(GET_PID_BY_NAME_LSOF % process_name) if results and len(results) == 1: @@ -286,7 +276,7 @@ def get_pid_by_port(port): # udp 0 0 0.0.0.0:5353 0.0.0.0:* - # udp6 0 0 fe80::7ae4:ff:fe2f::123 :::* - - if CALL_MOCKING or is_available("netstat"): + if is_available("netstat"): results = call(GET_PID_BY_PORT_NETSTAT) if results: @@ -320,7 +310,7 @@ def get_pid_by_port(port): # _tor tor 4397 15 tcp4 51.64.7.84:59374 7.42.1.102:9001 # _tor tor 4397 20 tcp4 51.64.7.84:51946 32.83.7.104:443 - if CALL_MOCKING or is_available("sockstat"): + if is_available("sockstat"): results = call(GET_PID_BY_PORT_SOCKSTAT % port) if results: @@ -348,7 +338,7 @@ def get_pid_by_port(port): # COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME # tor 1745 atagar 6u IPv4 14229 0t0 TCP 127.0.0.1:9051 (LISTEN) - if CALL_MOCKING or is_available("lsof"): + if is_available("lsof"): results = call(GET_PID_BY_PORT_LSOF) if results: @@ -387,7 +377,7 @@ def get_pid_by_open_file(path): # atagar@morrigan:~$ lsof -tw /tmp/foo # 4762 - if CALL_MOCKING or is_available("lsof"): + if is_available("lsof"): results = call(GET_PID_BY_FILE_LSOF % path) if results and len(results) == 1: @@ -409,14 +399,14 @@ def get_cwd(pid): """ # try fetching via the proc contents if it's available - if stem.util.proc.is_available() and not CALL_MOCKING: + if stem.util.proc.is_available(): try: return stem.util.proc.get_cwd(pid) except IOError: pass # Fall back to a pwdx query. This isn't available on BSD. logging_prefix = "get_cwd(%s):" % pid - if CALL_MOCKING or is_available("pwdx"): + if is_available("pwdx"): # pwdx results are of the form: # 3799: /home/atagar # 5839: No such process @@ -447,7 +437,7 @@ def get_cwd(pid): # p75717 # n/Users/atagar/tor/src/or - if CALL_MOCKING or is_available("lsof"): + if is_available("lsof"): results = call(GET_CWD_LSOF % pid) if results and len(results) == 2 and results[1].startswith("n/"): @@ -563,29 +553,6 @@ def call(command, suppress_exc = True): OSError if this fails and suppress_exc is False """ - # Most of our system functions rely on system calls through this function, so - # testing may need to mock responses to exercise our various functionality. - - if CALL_MOCKING: - mock_response = CALL_MOCKING(command) - - # Mocking either returns... - # - str/None for unit tests to emulate system calls - # - bool for integ tests to indicate if we should make this system call or - # suppress it, to selectively trigger logic - - if isinstance(mock_response, bool): - if mock_response: - pass # mocking indicates that we should go on to make the real call - else: - # call should be suppressed - if suppress_exc: return None - else: raise OSError("System call filtered by mocking") - else: - if mock_response == None and not suppress_exc: - raise OSError("Mocking provided a None response") - else: return mock_response - try: start_time = time.time() stdout, stderr = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE).communicate()

1 0

[stem/master] Refactoring ControlMessage integ tests
by atagar＠torproject.org 30 Jan '12

30 Jan '12

commit f38ad0811290b51b99475de28628895a663e7dec Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 14:40:27 2012 -0800 Refactoring ControlMessage integ tests Besides the normal cleanup I'm pushing most of the skipTest checks into the runner module. The advantage of this is that it simplifies tests a little more and allows a standardized skip message rather than having each module provide their own for the same thing. --- test/integ/connection/authentication.py | 4 +- test/integ/connection/connect.py | 4 +- test/integ/connection/protocolinfo.py | 4 +- test/integ/socket/control_message.py | 146 +++++++++++++------------------ test/integ/version.py | 13 +-- test/runner.py | 54 ++++++++--- 6 files changed, 106 insertions(+), 119 deletions(-) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index cc36c66..0762b23 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -78,9 +78,7 @@ def _get_auth_failure_message(auth_type): class TestAuthenticate(unittest.TestCase): def setUp(self): - # none of these tests apply if there's no control connection - if not test.runner.get_runner().is_accessible(): - self.skipTest("(no connection)") + test.runner.require_control(self) def test_authenticate_general(self): """ diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index ca3cf41..9b6337a 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -11,9 +11,7 @@ import test.runner class TestConnect(unittest.TestCase): def setUp(self): - # none of these tests apply if there's no control connection - if not test.runner.get_runner().is_accessible(): - self.skipTest("(no connection)") + test.runner.require_control(self) # prevents the function from printing to the real stdout self.original_stdout = sys.stdout diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index a0e1699..b572aee 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -26,9 +26,7 @@ def filter_system_call(prefixes): class TestProtocolInfo(unittest.TestCase): def setUp(self): - if not test.runner.get_runner().is_accessible(): - self.skipTest("(no connection)") - + test.runner.require_control(self) mocking.mock(stem.util.proc.is_available, mocking.return_false()) mocking.mock(stem.util.system.is_available, mocking.return_true()) diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index ec99edb..ce25c8f 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -3,7 +3,6 @@ Integration tests for the stem.socket.ControlMessage class. """ import re -import socket import unittest import stem.socket @@ -11,19 +10,19 @@ import stem.version import test.runner class TestControlMessage(unittest.TestCase): + def setUp(self): + test.runner.require_control(self) + def test_unestablished_socket(self): """ Checks message parsing when we have a valid but unauthenticated socket. """ - runner = test.runner.get_runner() - if not runner.is_accessible(): self.skipTest("(no control socket)") - # If an unauthenticated connection gets a message besides AUTHENTICATE or # PROTOCOLINFO then tor will give an 'Authentication required.' message and # hang up. - control_socket = runner.get_tor_socket(False) + control_socket = test.runner.get_runner().get_tor_socket(False) control_socket.send("GETINFO version") auth_required_response = control_socket.recv() @@ -63,36 +62,26 @@ class TestControlMessage(unittest.TestCase): Parses the response for a command which doesn't exist. """ - runner = test.runner.get_runner() - if not runner.is_accessible(): self.skipTest("(no control socket)") - control_socket = runner.get_tor_socket() - - control_socket.send("blarg") - unrecognized_command_response = control_socket.recv() - self.assertEquals('Unrecognized command "blarg"', str(unrecognized_command_response)) - self.assertEquals(['Unrecognized command "blarg"'], list(unrecognized_command_response)) - self.assertEquals('510 Unrecognized command "blarg"\r\n', unrecognized_command_response.raw_content()) - self.assertEquals([('510', ' ', 'Unrecognized command "blarg"')], unrecognized_command_response.content()) - - control_socket.close() + with test.runner.get_runner().get_tor_socket() as control_socket: + control_socket.send("blarg") + unrecognized_command_response = control_socket.recv() + self.assertEquals('Unrecognized command "blarg"', str(unrecognized_command_response)) + self.assertEquals(['Unrecognized command "blarg"'], list(unrecognized_command_response)) + self.assertEquals('510 Unrecognized command "blarg"\r\n', unrecognized_command_response.raw_content()) + self.assertEquals([('510', ' ', 'Unrecognized command "blarg"')], unrecognized_command_response.content()) def test_invalid_getinfo(self): """ Parses the response for a GETINFO query which doesn't exist. """ - runner = test.runner.get_runner() - if not runner.is_accessible(): self.skipTest("(no control socket)") - control_socket = runner.get_tor_socket() - - control_socket.send("GETINFO blarg") - unrecognized_key_response = control_socket.recv() - self.assertEquals('Unrecognized key "blarg"', str(unrecognized_key_response)) - self.assertEquals(['Unrecognized key "blarg"'], list(unrecognized_key_response)) - self.assertEquals('552 Unrecognized key "blarg"\r\n', unrecognized_key_response.raw_content()) - self.assertEquals([('552', ' ', 'Unrecognized key "blarg"')], unrecognized_key_response.content()) - - control_socket.close() + with test.runner.get_runner().get_tor_socket() as control_socket: + control_socket.send("GETINFO blarg") + unrecognized_key_response = control_socket.recv() + self.assertEquals('Unrecognized key "blarg"', str(unrecognized_key_response)) + self.assertEquals(['Unrecognized key "blarg"'], list(unrecognized_key_response)) + self.assertEquals('552 Unrecognized key "blarg"\r\n', unrecognized_key_response.raw_content()) + self.assertEquals([('552', ' ', 'Unrecognized key "blarg"')], unrecognized_key_response.content()) def test_getinfo_config_file(self): """ @@ -101,30 +90,22 @@ class TestControlMessage(unittest.TestCase): runner = test.runner.get_runner() torrc_dst = runner.get_torrc_path() - if not runner.is_accessible(): self.skipTest("(no control socket)") - control_socket = runner.get_tor_socket() - - control_socket.send("GETINFO config-file") - config_file_response = control_socket.recv() - self.assertEquals("config-file=%s\nOK" % torrc_dst, str(config_file_response)) - self.assertEquals(["config-file=%s" % torrc_dst, "OK"], list(config_file_response)) - self.assertEquals("250-config-file=%s\r\n250 OK\r\n" % torrc_dst, config_file_response.raw_content()) - self.assertEquals([("250", "-", "config-file=%s" % torrc_dst), ("250", " ", "OK")], config_file_response.content()) - control_socket.close() + with runner.get_tor_socket() as control_socket: + control_socket.send("GETINFO config-file") + config_file_response = control_socket.recv() + self.assertEquals("config-file=%s\nOK" % torrc_dst, str(config_file_response)) + self.assertEquals(["config-file=%s" % torrc_dst, "OK"], list(config_file_response)) + self.assertEquals("250-config-file=%s\r\n250 OK\r\n" % torrc_dst, config_file_response.raw_content()) + self.assertEquals([("250", "-", "config-file=%s" % torrc_dst), ("250", " ", "OK")], config_file_response.content()) def test_getinfo_config_text(self): """ Parses the 'GETINFO config-text' response. """ + test.runner.require_version(self, stem.version.Requirement.GETINFO_CONFIG_TEXT) runner = test.runner.get_runner() - req_version = stem.version.Requirement.GETINFO_CONFIG_TEXT - - if not runner.is_accessible(): - self.skipTest("(no control socket)") - elif runner.get_tor_version() < req_version: - self.skipTest("(requires %s)" % req_version) # We can't be certain of the order, and there may be extra config-text # entries as per... @@ -140,50 +121,43 @@ class TestControlMessage(unittest.TestCase): if line and not line.startswith("#"): torrc_contents.append(line) - control_socket = runner.get_tor_socket() - control_socket.send("GETINFO config-text") - config_text_response = control_socket.recv() - - # the response should contain two entries, the first being a data response - self.assertEqual(2, len(list(config_text_response))) - self.assertEqual("OK", list(config_text_response)[1]) - self.assertEqual(("250", " ", "OK"), config_text_response.content()[1]) - self.assertTrue(config_text_response.raw_content().startswith("250+config-text=\r\n")) - self.assertTrue(config_text_response.raw_content().endswith("\r\n.\r\n250 OK\r\n")) - self.assertTrue(str(config_text_response).startswith("config-text=\n")) - self.assertTrue(str(config_text_response).endswith("\nOK")) - - for torrc_entry in torrc_contents: - self.assertTrue("\n%s\n" % torrc_entry in str(config_text_response)) - self.assertTrue(torrc_entry in list(config_text_response)[0]) - self.assertTrue("%s\r\n" % torrc_entry in config_text_response.raw_content()) - self.assertTrue("%s" % torrc_entry in config_text_response.content()[0][2]) - - control_socket.close() + with runner.get_tor_socket() as control_socket: + control_socket.send("GETINFO config-text") + config_text_response = control_socket.recv() + + # the response should contain two entries, the first being a data response + self.assertEqual(2, len(list(config_text_response))) + self.assertEqual("OK", list(config_text_response)[1]) + self.assertEqual(("250", " ", "OK"), config_text_response.content()[1]) + self.assertTrue(config_text_response.raw_content().startswith("250+config-text=\r\n")) + self.assertTrue(config_text_response.raw_content().endswith("\r\n.\r\n250 OK\r\n")) + self.assertTrue(str(config_text_response).startswith("config-text=\n")) + self.assertTrue(str(config_text_response).endswith("\nOK")) + + for torrc_entry in torrc_contents: + self.assertTrue("\n%s\n" % torrc_entry in str(config_text_response)) + self.assertTrue(torrc_entry in list(config_text_response)[0]) + self.assertTrue("%s\r\n" % torrc_entry in config_text_response.raw_content()) + self.assertTrue("%s" % torrc_entry in config_text_response.content()[0][2]) def test_bw_event(self): """ - Issues 'SETEVENTS BW' and parses a few events. + Issues 'SETEVENTS BW' and parses a couple events. """ - runner = test.runner.get_runner() - if not runner.is_accessible(): self.skipTest("(no control socket)") - control_socket = runner.get_tor_socket() - - control_socket.send("SETEVENTS BW") - setevents_response = control_socket.recv() - self.assertEquals("OK", str(setevents_response)) - self.assertEquals(["OK"], list(setevents_response)) - self.assertEquals("250 OK\r\n", setevents_response.raw_content()) - self.assertEquals([("250", " ", "OK")], setevents_response.content()) - - # Tor will emit a BW event once per second. Parsing two of them. - - for _ in range(2): - bw_event = control_socket.recv() - self.assertTrue(re.match("BW [0-9]+ [0-9]+", str(bw_event))) - self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) - self.assertEquals(("650", " "), bw_event.content()[0][:2]) - - control_socket.close() + with test.runner.get_runner().get_tor_socket() as control_socket: + control_socket.send("SETEVENTS BW") + setevents_response = control_socket.recv() + self.assertEquals("OK", str(setevents_response)) + self.assertEquals(["OK"], list(setevents_response)) + self.assertEquals("250 OK\r\n", setevents_response.raw_content()) + self.assertEquals([("250", " ", "OK")], setevents_response.content()) + + # Tor will emit a BW event once per second. Parsing two of them. + + for _ in range(2): + bw_event = control_socket.recv() + self.assertTrue(re.match("BW [0-9]+ [0-9]+", str(bw_event))) + self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) + self.assertEquals(("650", " "), bw_event.content()[0][:2]) diff --git a/test/integ/version.py b/test/integ/version.py index e344ef8..833cbd2 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -35,11 +35,9 @@ class TestVersion(unittest.TestCase): test instance provides. """ - runner = test.runner.get_runner() - - if not runner.is_accessible(): - self.skipTest("(no connection)") + test.runner.require_control(self) + runner = test.runner.get_runner() system_tor_version = stem.version.get_system_tor_version(runner.get_tor_command()) self.assertEquals(runner.get_tor_version(), system_tor_version) @@ -49,12 +47,9 @@ class TestVersion(unittest.TestCase): we can parse it. """ - runner = test.runner.get_runner() - - if not runner.is_accessible(): - self.skipTest("(no connection)") + test.runner.require_control(self) - control_socket = runner.get_tor_socket() + control_socket = test.runner.get_runner().get_tor_socket() control_socket.send("GETINFO version") version_response = control_socket.recv() control_socket.close() diff --git a/test/runner.py b/test/runner.py index 0e71ade..3cf5542 100644 --- a/test/runner.py +++ b/test/runner.py @@ -6,6 +6,8 @@ about the tor test instance they're running against. RunnerStopped - Runner doesn't have an active tor instance TorInaccessable - Tor can't be queried for the information +require_control - skips the test unless tor provides a controller endpoint +require_version - skips the test unless we meet a tor version requirement exercise_socket - Does a basic sanity check that a control socket can be used get_runner - Singleton for fetching our runtime context. @@ -86,13 +88,36 @@ class TorInaccessable(Exception): "Raised when information is needed from tor but the instance we have is inaccessable" pass +def require_control(test_case): + """ + Skips the test unless tor provides an endpoint for controllers to attach to. + + Arguments: + test_case (unittest.TestCase) - test being ran + """ + + if not test.runner.get_runner().is_accessible(): + test_case.skipTest("(no connection)") + +def require_version(test_case, req_version): + """ + Skips the test unless we meet the required version. + + Arguments: + test_case (unittest.TestCase) - test being ran + req_version (stem.version.Version) - required tor version for the test + """ + + if get_runner().get_tor_version() < req_version: + test_case.skipTest("(requires %s)" % req_version) + def exercise_socket(test_case, control_socket): """ Checks that we can now use the socket by issuing a 'GETINFO config-file' query. Arguments: - test_case (unittest.TestCase) - unit testing case being ran + test_case (unittest.TestCase) - test being ran control_socket (stem.socket.ControlSocket) - socket to be tested """ @@ -380,22 +405,21 @@ class Runner: Returns: stem.version.Version for our test instance - - Raises: - TorInaccessable if this can't be determined """ - # TODO: replace with higher level functions when we've completed a basic - # controller class - - control_socket = self.get_tor_socket() - - control_socket.send("GETINFO version") - version_response = control_socket.recv() - control_socket.close() - - tor_version = list(version_response)[0][8:] - return stem.version.Version(tor_version) + try: + # TODO: replace with higher level functions when we've completed a basic + # controller class + control_socket = self.get_tor_socket() + + control_socket.send("GETINFO version") + version_response = control_socket.recv() + control_socket.close() + + tor_version = list(version_response)[0][8:] + return stem.version.Version(tor_version) + except TorInaccessable: + return stem.version.get_system_tor_version(self.get_tor_command()) def get_tor_command(self): """

1 0

[stem/master] Refactoring system integ tests
by atagar＠torproject.org 30 Jan '12

30 Jan '12

commit 5e81a0b546413f6ef21266cb74b81e9be4c6a27c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 17:31:53 2012 -0800 Refactoring system integ tests This is the last of the integration tests to be cleaned up. It's also the last user of the system module's CALL_MOCKING so now we can get rid of it - hazaa! --- test/integ/connection/protocolinfo.py | 14 +---- test/integ/util/system.py | 124 +++++++++++++++++++-------------- test/mocking.py | 19 +++++ test/runner.py | 14 ++--- 4 files changed, 97 insertions(+), 74 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index b572aee..e0e8805 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -10,19 +10,7 @@ import stem.socket import stem.connection import stem.util.system import test.mocking as mocking - -def filter_system_call(prefixes): - """ - Provides a functor that passes calls on to the stem.util.system.call() - function if it matches one of the prefixes, and acts as a no-op otherwise. - """ - - def _filter_system_call(command): - for prefix in prefixes: - if command.startswith(prefix): - return stem.util.system.call(command) - - return _filter_system_call +from test.integ.util.system import filter_system_call class TestProtocolInfo(unittest.TestCase): def setUp(self): diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 9295e9b..f9c00a6 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -1,5 +1,5 @@ """ -Integratnio tests for the stem.util.system functions against the tor process +Integration tests for the stem.util.system functions against the tor process that we're running. """ @@ -7,8 +7,30 @@ import os import getpass import unittest -import test.runner import stem.util.system +import test.runner +import test.mocking as mocking + +def filter_system_call(prefixes): + """ + Provides a functor that passes calls on to the stem.util.system.call() + function if it matches one of the prefixes, and acts as a no-op otherwise. + """ + + def _filter_system_call(command): + for prefix in prefixes: + if command.startswith(prefix): + real_call_function = mocking.get_real_function(stem.util.system.call) + return real_call_function(command) + + return _filter_system_call + +def _has_port(): + """ + True if our test runner has a control port, False otherwise. + """ + + return test.runner.Torrc.PORT in test.runner.get_runner().get_options() class TestSystem(unittest.TestCase): is_extra_tor_running = None @@ -27,10 +49,9 @@ class TestSystem(unittest.TestCase): ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD) results = [r for r in ps_results if r.endswith(" tor")] self.is_extra_tor_running = len(results) > 1 - + def tearDown(self): - # resets call mocking back to being disabled - stem.util.system.CALL_MOCKING = None + mocking.revert_mocking() def test_is_available(self): """ @@ -60,8 +81,8 @@ class TestSystem(unittest.TestCase): if self.is_extra_tor_running: self.skipTest("(multiple tor instances)") - runner = test.runner.get_runner() - self.assertEquals(runner.get_pid(), stem.util.system.get_pid_by_name("tor")) + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) self.assertEquals(None, stem.util.system.get_pid_by_name("blarg_and_stuff")) def test_get_pid_by_name_pgrep(self): @@ -75,7 +96,10 @@ class TestSystem(unittest.TestCase): self.skipTest("(pgrep unavailable)") pgrep_prefix = stem.util.system.GET_PID_BY_NAME_PGREP % "" - self._run_pid_test(pgrep_prefix, stem.util.system.get_pid_by_name, "tor") + mocking.mock(stem.util.system.call, filter_system_call([pgrep_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) def test_get_pid_by_name_pidof(self): """ @@ -88,7 +112,10 @@ class TestSystem(unittest.TestCase): self.skipTest("(pidof unavailable)") pidof_prefix = stem.util.system.GET_PID_BY_NAME_PIDOF % "" - self._run_pid_test(pidof_prefix, stem.util.system.get_pid_by_name, "tor") + mocking.mock(stem.util.system.call, filter_system_call([pidof_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) def test_get_pid_by_name_ps_linux(self): """ @@ -103,7 +130,10 @@ class TestSystem(unittest.TestCase): self.skipTest("(linux only)") ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_LINUX % "" - self._run_pid_test(ps_prefix, stem.util.system.get_pid_by_name, "tor") + mocking.mock(stem.util.system.call, filter_system_call([ps_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) def test_get_pid_by_name_ps_bsd(self): """ @@ -117,8 +147,11 @@ class TestSystem(unittest.TestCase): elif not stem.util.system.is_bsd(): self.skipTest("(bsd only)") - ps_cmd = stem.util.system.GET_PID_BY_NAME_PS_BSD - self._run_pid_test(ps_cmd, stem.util.system.get_pid_by_name, "tor") + ps_prefix = stem.util.system.GET_PID_BY_NAME_PS_BSD + mocking.mock(stem.util.system.call, filter_system_call([ps_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) def test_get_pid_by_name_lsof(self): """ @@ -130,13 +163,14 @@ class TestSystem(unittest.TestCase): self.skipTest("(multiple tor instances)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") - elif not runner.is_accessible(): - self.skipTest("(unable to check for DisableDebuggerAttachment)") elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % "" - self._run_pid_test(lsof_prefix, stem.util.system.get_pid_by_name, "tor") + mocking.mock(stem.util.system.call, filter_system_call([lsof_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_name("tor")) def test_get_pid_by_port(self): """ @@ -144,7 +178,7 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() - if not self._has_port(): + if not _has_port(): self.skipTest("(test instance has no port)") elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") @@ -159,7 +193,7 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() - if not self._has_port(): + if not _has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("netstat"): self.skipTest("(netstat unavailable)") @@ -168,8 +202,11 @@ class TestSystem(unittest.TestCase): elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") - netstat_cmd = stem.util.system.GET_PID_BY_PORT_NETSTAT - self._run_pid_test(netstat_cmd, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) + netstat_prefix = stem.util.system.GET_PID_BY_PORT_NETSTAT + mocking.mock(stem.util.system.call, filter_system_call([netstat_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_port(test.runner.CONTROL_PORT)) def test_get_pid_by_port_sockstat(self): """ @@ -177,7 +214,7 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() - if not self._has_port(): + if not _has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("sockstat"): self.skipTest("(sockstat unavailable)") @@ -187,7 +224,10 @@ class TestSystem(unittest.TestCase): self.skipTest("(DisableDebuggerAttachment is set)") sockstat_prefix = stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "" - self._run_pid_test(sockstat_prefix, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) + mocking.mock(stem.util.system.call, filter_system_call([sockstat_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_port(test.runner.CONTROL_PORT)) def test_get_pid_by_port_lsof(self): """ @@ -195,15 +235,18 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() - if not self._has_port(): + if not _has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") - lsof_cmd = stem.util.system.GET_PID_BY_PORT_LSOF - self._run_pid_test(lsof_cmd, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) + lsof_prefix = stem.util.system.GET_PID_BY_PORT_LSOF + mocking.mock(stem.util.system.call, filter_system_call([lsof_prefix])) + + tor_pid = test.runner.get_runner().get_pid() + self.assertEquals(tor_pid, stem.util.system.get_pid_by_port(test.runner.CONTROL_PORT)) def test_get_pid_by_open_file(self): """ @@ -226,12 +269,11 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() - if not runner.is_accessible(): - self.skipTest("(unable to check for DisableDebuggerAttachment)") - elif not runner.is_ptraceable(): + if not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") - self.assertEquals(runner.get_tor_cwd(), stem.util.system.get_cwd(runner.get_pid())) + runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() + self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) self.assertEquals(None, stem.util.system.get_cwd(99999)) def test_get_cwd_pwdx(self): @@ -242,14 +284,12 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available("pwdx"): self.skipTest("(pwdx unavailable)") - elif not runner.is_accessible(): - self.skipTest("(unable to check for DisableDebuggerAttachment)") elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command pwdx_prefix = stem.util.system.GET_CWD_PWDX % "" - stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(pwdx_prefix) + mocking.mock(stem.util.system.call, filter_system_call([pwdx_prefix])) runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) @@ -262,14 +302,12 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") - elif not runner.is_accessible(): - self.skipTest("(unable to check for DisableDebuggerAttachment)") elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command lsof_prefix = "lsof -a -p " - stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(lsof_prefix) + mocking.mock(stem.util.system.call, filter_system_call([lsof_prefix])) runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) @@ -297,22 +335,4 @@ class TestSystem(unittest.TestCase): self.assertEquals(home_dir, stem.util.system.expand_path("~/")) self.assertEquals(home_dir, stem.util.system.expand_path("~%s" % username)) self.assertEquals(os.path.join(home_dir, "foo"), stem.util.system.expand_path("~%s/foo" % username)) - - def _run_pid_test(self, cmd_prefix, test_function, arg): - """ - Runs a get_pid_by_* test with the given inputs. - """ - - # filter the call function to only allow this command - stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(cmd_prefix) - - runner_pid = test.runner.get_runner().get_pid() - self.assertEquals(runner_pid, test_function(arg)) - - def _has_port(self): - """ - True if our test runner has a control port, False otherwise. - """ - - return test.runner.Torrc.PORT in test.runner.get_runner().get_options() diff --git a/test/mocking.py b/test/mocking.py index 0d01a60..30ba490 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -6,6 +6,7 @@ calling 'revert_mocking'. mock - replaces a function with an alternative implementation revert_mocking - reverts any changes made by the mock function +get_real_function - provides the non-mocked version of a function Mocking Functions no_op - does nothing @@ -98,6 +99,24 @@ def revert_mocking(): MOCK_STATE.clear() +def get_real_function(function): + """ + Provides the original, non-mocked implementation for a function. This simply + returns the current implementation if it isn't being mocked. + + Arguments: + function (function) - function to look up the original implementation of + + Returns: + original implementation of the function + """ + + if "mock_id" in function.__dict__: + mocking_id = function.__dict__["mock_id"] + return MOCK_STATE[mocking_id][2] + else: + return function + def get_message(content, reformat = True): """ Provides a ControlMessage with content modified to be parsable. This makes diff --git a/test/runner.py b/test/runner.py index 3cf5542..07a54fd 100644 --- a/test/runner.py +++ b/test/runner.py @@ -276,18 +276,14 @@ class Runner: Returns: True if debugger attachment is disallowd, False otherwise - - Raises: - TorInaccessable if this can't be determined """ - # TODO: replace higher level GETCONF query when we have a controller class - control_socket = self.get_tor_socket() - control_socket.send("GETCONF DisableDebuggerAttachment") - getconf_response = control_socket.recv() - control_socket.close() + # If we're running a tor version where ptrace is disabled and we didn't + # set 'DisableDebuggerAttachment=1' then we can infer that it's disabled. - return str(getconf_response) != "DisableDebuggerAttachment=1" + tor_version = self.get_tor_version() + has_option = tor_version >= stem.version.Requirement.TORRC_DISABLE_DEBUGGER_ATTACHMENT + return not has_option or Torrc.PTRACE in self.get_options() def get_options(self): """

1 0

[stem/master] Renaming version requirements to be hierarchical
by atagar＠torproject.org 30 Jan '12

30 Jan '12

commit 39672342bf81a5de15f40fe78a3170673f4035de Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 13:36:27 2012 -0800 Renaming version requirements to be hierarchical Including a prefix with all version requirements for the option's catagory. Currently this includes GETINFO_* and TORRC_*. --- stem/version.py | 8 ++++---- test/settings.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/version.py b/stem/version.py index e5b9997..74ca8f2 100644 --- a/stem/version.py +++ b/stem/version.py @@ -23,7 +23,7 @@ import re import stem.util.enum import stem.util.system -# cache for the get_tor_version function +# cache for the get_system_tor_version function VERSION_CACHE = {} def get_system_tor_version(tor_cmd = "tor"): @@ -141,8 +141,8 @@ class Version: return 0 Requirement = stem.util.enum.Enum( - ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), - ("CONTROL_SOCKET", Version("0.2.0.30")), - ("DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), + ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), + ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ) diff --git a/test/settings.cfg b/test/settings.cfg index e004a98..b55dc7e 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -58,7 +58,7 @@ target.description RUN_ALL => Runs integration tests for all connection con # Version that we need to run the target. These need to match an enumeration of # stem.version.Requirement. -target.prereq RUN_PTRACE => DISABLE_DEBUGGER_ATTACHMENT +target.prereq RUN_PTRACE => TORRC_DISABLE_DEBUGGER_ATTACHMENT # Torrc configuration options included with the target. Having this option set # means that each of these targets will have a dedicated integration test run.

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 798719f5fbdc18e1c02da7440c19531d54a49d68 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 20:45:02 2012 +0000 Update translations for gettor --- ru/gettor.po | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index 8fedc1f..847dbb7 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-29 20:07+0000\n" +"PO-Revision-Date: 2012-01-29 20:35+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -165,6 +165,8 @@ msgid "" "SMALLER SIZED PACKAGES\n" "======================" msgstr "" +"ДИСТРИБУТИВЫ МЕНЬШЕГО РАЗМЕРА\n" +"=============================" #: lib/gettor/i18n.py:92 msgid "" @@ -172,6 +174,9 @@ msgid "" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." msgstr "" +"Если у вас узкий канал или ваш провайдер не позволяет вам\n" +"получать большие вложения в вашем почтовом ящике, GetTor может отправить вам несколько\n" +"небольших пакетов вместо одного большого." #: lib/gettor/i18n.py:96 msgid "" @@ -181,6 +186,10 @@ msgid "" " windows\n" " split" msgstr "" +"Просто добавьте ключевое слово 'split' на отдельную (что важно) строку, например:\n" +"\n" +" windows\n" +" split" #: lib/gettor/i18n.py:102 msgid "" @@ -381,7 +390,7 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "" +msgstr "windows:" #: lib/gettor/i18n.py:218 msgid "" @@ -402,30 +411,40 @@ msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "" +"linux-i386:\n" +"Дистрибутив Tor Browser Bundle для Linux, 32-битные версии." #: lib/gettor/i18n.py:229 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." msgstr "" +"Обратите внимание, что этот дистрибутив достаточно большой и требует чтобы " +"ваш email провайдер позволял вложения размером около 30 Мб." #: lib/gettor/i18n.py:232 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." msgstr "" +"linux-x86_64:\n" +"Дистрибутив Tor Browser Bundle для Linux, 64-битные версии." #: lib/gettor/i18n.py:235 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." msgstr "" +"исходник:\n" +"Исходный код Tor, для экспертов. Большинству пользователей данный дистрибутив не нужен." #: lib/gettor/i18n.py:238 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" msgstr "" +"ЧАСТО ЗАДАВАЕМЫЕ ВОПРОСЫ\n" +"========================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" @@ -447,6 +466,14 @@ msgid "" "\n" " https://www.torproject.org/about/overview.html.en" msgstr "" +"Tor - программа, которую вы можете запустить на своём компьютере, которая помогает\n" +"обеспечить вашу безопасность в Интернет. Tor защищает вас путем перенаправления ваших коммуникаций по распределенной сети ретрансляторов запущенных добровольцами\n" +"по всему миру: это не даёт возможности наблюдения Интернет соединения\n" +"от выявления сайтов, которые вы посещаете, и не даёт возможности сайтам, которые вы посещаете,\n" +"узнать ваше физическое местоположение. Этот набор ретрансляторов добровольцев и называется\n" +"сетью Tor. Вы можете узнать больше о том как работает Tor здесь:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" @@ -458,13 +485,13 @@ msgid "" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." msgstr "" -"Tor Browser Bundle (TBB) - это набор, который мы рекомендуем большинству пользователей.\n" -"Этот набор включает всё что необходимо для безопасного серфинга Интернет.\n" +"Tor Browser Bundle (TBB) - это дистрибутив, который мы рекомендуем большинству пользователей.\n" +"Этот дистрибутив включает всё что необходимо для безопасного серфинга Интернет.\n" "Просто распакуйте и запустите." #: lib/gettor/i18n.py:261 msgid "What package should I request?" -msgstr "Какой набор я должен запросить?" +msgstr "Какой дистрибутив я должен запросить?" #: lib/gettor/i18n.py:263 msgid "" @@ -475,7 +502,7 @@ msgid "" msgstr "" "Это зависит от операционной системы, которую вы используете. Например, если ваша\n" "операционная система - Microsoft Windows, вы должны запросить \"windows\". Здесь\n" -"краткое описание всех наборов для запроса и для каких операционных\n" +"краткое описание всех дистрибутивов для запроса и для каких операционных\n" "систем они пригодны:" #: lib/gettor/i18n.py:268

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit e1cd3e32416643ab8a0ccadbed2bc6061bb51799 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 20:15:08 2012 +0000 Update translations for gettor --- ru/gettor.po | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index c76d6bf..8fedc1f 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -4,14 +4,15 @@ # # Translators: # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <liquixis(a)gmail.com>, 2012. # Valerij Ler <lerkru(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: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-16 21:02+0000\n" -"Last-Translator: Valerij Ler <lerkru(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-29 20:07+0000\n" +"Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,6 +64,8 @@ msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" msgstr "" +"Если у вас есть какие-либо вопросы или что-то не работает, вы можете связаться с\n" +"человеком по этому email адресу поддержки: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -426,11 +429,11 @@ msgstr "" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "Что такое Tor?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "Название \"Tor\" может обозначать несколько различных компонентов." #: lib/gettor/i18n.py:245 msgid "" @@ -447,7 +450,7 @@ msgstr "" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Что такое Tor Browser Bundle?" #: lib/gettor/i18n.py:257 msgid "" @@ -455,10 +458,13 @@ msgid "" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." msgstr "" +"Tor Browser Bundle (TBB) - это набор, который мы рекомендуем большинству пользователей.\n" +"Этот набор включает всё что необходимо для безопасного серфинга Интернет.\n" +"Просто распакуйте и запустите." #: lib/gettor/i18n.py:261 msgid "What package should I request?" -msgstr "" +msgstr "Какой набор я должен запросить?" #: lib/gettor/i18n.py:263 msgid "" @@ -467,18 +473,22 @@ msgid "" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" msgstr "" +"Это зависит от операционной системы, которую вы используете. Например, если ваша\n" +"операционная система - Microsoft Windows, вы должны запросить \"windows\". Здесь\n" +"краткое описание всех наборов для запроса и для каких операционных\n" +"систем они пригодны:" #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?" -msgstr "" +msgstr "Как мне распаковать файл(ы), которые вы мне выслали?" #: lib/gettor/i18n.py:270 msgid "QUESTION:" -msgstr "" +msgstr "ВОПРОС:" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "" +msgstr "ОТВЕТ:" #: lib/gettor/i18n.py:274 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit e0f12b1f505fad5bac9c8fb4bdc866762b624feb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 20:15:03 2012 +0000 Update translations for bridgedb --- ru/bridgedb.po | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ru/bridgedb.po b/ru/bridgedb.po index ef10c3d..747b962 100644 --- a/ru/bridgedb.po +++ b/ru/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-01-29 19:39+0000\n" +"PO-Revision-Date: 2012-01-29 19:53+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,12 @@ msgid "" "of the mail. However, so we can make it harder for an attacker to learn\n" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" -msgstr "Другой способ" +msgstr "" +"Другой способ найти адреса публичных мостов - это отправить e-mail на адрес\n" +"bridges(a)torproject.org со строкой \"get bridges\" в качестве тела\n" +"сообщения. Однако, мы можем сделать труднее для атакующего узнать\n" +"множество адресов мостов, вы должны отправить этот запрос с e-mail адреса на\n" +"одном из следующих доменов:" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 774cb0d9866d7254894753f7331e4e1af260f310 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 19:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 0eaa2d9..d98b1ed 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 19:14+0000\n" +"PO-Revision-Date: 2012-01-29 19:19+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1303,13 +1303,15 @@ msgstr "" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "لطفن در این آدرس یک تیکت پر کنید:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgstr "" +"<a " +"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" @@ -3636,7 +3638,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "بریدن" msgctxt "TorrcDialog" msgid "Copy" @@ -3644,7 +3646,7 @@ msgstr "کپی" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "چسباندن" msgctxt "TorrcDialog" msgid "Undo"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit e98b55b96cfa08464951c09ab689309e4f0a5080 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 19:45:01 2012 +0000 Update translations for bridgedb --- ru/bridgedb.po | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ru/bridgedb.po b/ru/bridgedb.po index 157eedd..ef10c3d 100644 --- a/ru/bridgedb.po +++ b/ru/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-01-29 19:13+0000\n" +"PO-Revision-Date: 2012-01-29 19:39+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -40,12 +40,17 @@ msgid "" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." msgstr "" +"Для использования строк выше, откройте страницу Vidalia настройки Сети, и нажмите\n" +"\"Мой провайдер Интернет блокирует соединения с сетью Tor\". Затем добавьте каждый адрес моста\n" +"за раз." #: lib/bridgedb/I18n.py:32 msgid "" "Configuring more than one bridge address will make your Tor connection\n" "more stable, in case some of the bridges become unreachable." msgstr "" +"Настройка более чем одного адреса моста сделает ваше соединение Tor\n" +"более стабильным, в случаях если несколько мостов станут недоступны." #: lib/bridgedb/I18n.py:35 msgid "" @@ -54,11 +59,11 @@ msgid "" "of the mail. However, so we can make it harder for an attacker to learn\n" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" -msgstr "" +msgstr "Другой способ" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Это автоматическое сообщение; пожалуйста, не отвечайте на него.]" #: lib/bridgedb/I18n.py:43 msgid "" @@ -67,13 +72,17 @@ msgid "" "will change every few days, so check back periodically if you need more\n" "bridge addresses." msgstr "" +"Другой способ найти адреса публичных мостов - это посетить\n" +"https://bridges.torproject.org/. Данные на этой странице\n" +"меняются каждые несколько дней, так что заходите периодически если вам будут нужны еще\n" +"адреса мостов." #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)" -msgstr "" +msgstr "(на данный момент нет доступных мостов)" #: lib/bridgedb/I18n.py:50 msgid "(e-mail requests not currently supported)" -msgstr "" +msgstr "(e-mail запосы на данный момент не поддерживаются)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 456ff02f9fbc421122be923a6e4b411f84b38fb3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 19:15:18 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index a25c4bc..0eaa2d9 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 03:53+0000\n" +"PO-Revision-Date: 2012-01-29 19:14+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3530,15 +3530,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "آزمایش دسترسی پورت دایرکتوری موفق بود!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "پورت دایرکتوری بازپخش کننده شما از شبکه تور قابل دسترس است!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "آزمایش دسترسی پورت دایرکتوری ناموفق بود" msgctxt "StatusEventWidget" msgid "" @@ -3560,7 +3560,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "بازپخش کننده شما آنلاین است" msgctxt "StatusEventWidget" msgid "" @@ -3624,13 +3624,15 @@ msgstr "شکست در درهم درآوردن اسم رمز کنترل." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "ویرایش torrc" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." msgstr "" +"تنظیمات را ذخیره کن. اگر علامت نخورده باشد فقط برای نمونه تور فعلی اعمال " +"میشود." msgctxt "TorrcDialog" msgid "Cut"

1 0