- tor-commits - lists.torproject.org

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

29 Jan '12

commit 39d93f75533243948d3222f800707dcb320b1a76 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 28 23:42:14 2012 -0800 Refactoring connection integ tests More tidying up of the integ tests. The connection integ used a common port/socket tester function but the common code was tiny enough that it's clearer without it. --- test/integ/connection/connect.py | 57 +++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 31 deletions(-) diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index 00b0e04..ca3cf41 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -14,48 +14,43 @@ class TestConnect(unittest.TestCase): # none of these tests apply if there's no control connection if not test.runner.get_runner().is_accessible(): self.skipTest("(no connection)") + + # prevents the function from printing to the real stdout + self.original_stdout = sys.stdout + sys.stdout = StringIO.StringIO() + + def tearDown(self): + sys.stdout = self.original_stdout def test_connect_port(self): """ Basic sanity checks for the connect_port function. """ - self._test_connect(True) + control_socket = stem.connection.connect_port( + control_port = test.runner.CONTROL_PORT, + password = test.runner.CONTROL_PASSWORD, + controller = stem.connection.Controller.NONE) + + if test.runner.Torrc.PORT in test.runner.get_runner().get_options(): + test.runner.exercise_socket(self, control_socket) + control_socket.close() + else: + self.assertEquals(control_socket, None) def test_connect_socket_file(self): """ Basic sanity checks for the connect_socket_file function. """ - self._test_connect(False) - - def _test_connect(self, is_port): - """ - Common implementations for the test_connect_* functions. - """ - - # prevents the function from printing to the real stdout - original_stdout = sys.stdout - sys.stdout = StringIO.StringIO() + control_socket = stem.connection.connect_socket_file( + socket_path = test.runner.CONTROL_SOCKET_PATH, + password = test.runner.CONTROL_PASSWORD, + controller = stem.connection.Controller.NONE) - try: - ctl_pw = test.runner.CONTROL_PASSWORD - controller = stem.connection.Controller.NONE - - if is_port: - opt_type = test.runner.Torrc.PORT - ctl_port = test.runner.CONTROL_PORT - control_socket = stem.connection.connect_port(control_port = ctl_port, password = ctl_pw, controller = controller) - else: - opt_type = test.runner.Torrc.SOCKET - ctl_socket = test.runner.CONTROL_SOCKET_PATH - control_socket = stem.connection.connect_socket_file(socket_path = ctl_socket, password = ctl_pw, controller = controller) - - if opt_type in test.runner.get_runner().get_options(): - test.runner.exercise_socket(self, control_socket) - control_socket.close() - else: - self.assertEquals(control_socket, None) - finally: - sys.stdout = original_stdout + if test.runner.Torrc.SOCKET in test.runner.get_runner().get_options(): + test.runner.exercise_socket(self, control_socket) + control_socket.close() + else: + self.assertEquals(control_socket, None)

1 0

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

29 Jan '12

commit 51e21cf88643e63953e897d0cd05875d00c26991 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 00:49:29 2012 -0800 Refactoring protocolinfo integ tests Cleaning up the protocolinfo integ tests, joining a couple that had a similar prupose and other miscellaneous refactoring. --- test/integ/connection/protocolinfo.py | 152 +++++++++++++-------------------- 1 files changed, 59 insertions(+), 93 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 6c9519e..a0e1699 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -9,11 +9,31 @@ import test.runner 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 class TestProtocolInfo(unittest.TestCase): + def setUp(self): + if not test.runner.get_runner().is_accessible(): + self.skipTest("(no connection)") + + mocking.mock(stem.util.proc.is_available, mocking.return_false()) + mocking.mock(stem.util.system.is_available, mocking.return_true()) + def tearDown(self): - # resets call mocking back to being disabled - stem.util.system.CALL_MOCKING = None + mocking.revert_mocking() def test_parsing(self): """ @@ -21,13 +41,7 @@ class TestProtocolInfo(unittest.TestCase): connection. """ - runner = test.runner.get_runner() - - if not runner.is_accessible(): - self.skipTest("(no connection)") - - control_socket = runner.get_tor_socket(False) - + control_socket = test.runner.get_runner().get_tor_socket(False) control_socket.send("PROTOCOLINFO 1") protocolinfo_response = control_socket.recv() stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) @@ -40,76 +54,44 @@ class TestProtocolInfo(unittest.TestCase): self.assertNotEqual(None, protocolinfo_response.tor_version) self.assertNotEqual(None, protocolinfo_response.auth_methods) - self.assert_protocolinfo_attr(protocolinfo_response) + self.assert_matches_test_config(protocolinfo_response) - def test_get_protocolinfo_by_port(self): - """ - Exercises the stem.connection.get_protocolinfo function with a control - port. + def test_get_protocolinfo_path_expansion(self): """ + If we're running with the 'RELATIVE' target then test_parsing() will + exercise cookie path expansion when we're able to query the pid by our + prcess name. This test selectively disables system.call() so we exercise + the expansion via our control port or socket file. - # If we have both the 'RELATIVE' target and a cookie then test_parsing - # should exercise cookie expansion using a pid lookup by process name. - # Disabling those lookups so we exercise the lookup by port/socket file - # too. Gotta remember the get_cwd functions too. - - cwd_by_port_lookup_prefixes = ( - stem.util.system.GET_PID_BY_PORT_NETSTAT, - stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "", - stem.util.system.GET_PID_BY_PORT_LSOF, - stem.util.system.GET_CWD_PWDX % "", - "lsof -a -p ") - - def port_lookup_filter(command): - for prefix in cwd_by_port_lookup_prefixes: - if command.startswith(prefix): return True - - return False - - stem.util.system.CALL_MOCKING = port_lookup_filter + This test is largely redundant with test_parsing() if we aren't running + with the 'RELATIVE' target. + """ if test.runner.Torrc.PORT in test.runner.get_runner().get_options(): - control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) - protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response) + cwd_by_port_lookup_prefixes = ( + stem.util.system.GET_PID_BY_PORT_NETSTAT, + stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "", + stem.util.system.GET_PID_BY_PORT_LSOF, + stem.util.system.GET_CWD_PWDX % "", + "lsof -a -p ") - # we should have a usable socket at this point - self.assertTrue(control_socket.is_alive()) - control_socket.close() + mocking.mock(stem.util.system.call, filter_system_call(cwd_by_port_lookup_prefixes)) + control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) else: - # we don't have a control port - self.assertRaises(stem.socket.SocketError, stem.socket.ControlPort, "127.0.0.1", test.runner.CONTROL_PORT) - - def test_get_protocolinfo_by_socket(self): - """ - Exercises the stem.connection.get_protocolinfo function with a control - socket. - """ - - cwd_by_socket_lookup_prefixes = ( - stem.util.system.GET_PID_BY_FILE_LSOF % "", - stem.util.system.GET_CWD_PWDX % "", - "lsof -a -p ") - - def socket_lookup_filter(command): - for prefix in cwd_by_socket_lookup_prefixes: - if command.startswith(prefix): return True + cwd_by_socket_lookup_prefixes = ( + stem.util.system.GET_PID_BY_FILE_LSOF % "", + stem.util.system.GET_CWD_PWDX % "", + "lsof -a -p ") - return False + mocking.mock(stem.util.system.call, filter_system_call(cwd_by_socket_lookup_prefixes)) + control_socket = stem.socket.ControlSocketFile(test.runner.CONTROL_SOCKET_PATH) - stem.util.system.CALL_MOCKING = socket_lookup_filter + protocolinfo_response = stem.connection.get_protocolinfo(control_socket) + self.assert_matches_test_config(protocolinfo_response) - if test.runner.Torrc.SOCKET in test.runner.get_runner().get_options(): - control_socket = stem.socket.ControlSocketFile(test.runner.CONTROL_SOCKET_PATH) - protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response) - - # we should have a usable socket at this point - self.assertTrue(control_socket.is_alive()) - control_socket.close() - else: - # we don't have a control socket - self.assertRaises(stem.socket.SocketError, stem.socket.ControlSocketFile, test.runner.CONTROL_SOCKET_PATH) + # we should have a usable socket at this point + self.assertTrue(control_socket.is_alive()) + control_socket.close() def test_multiple_protocolinfo_calls(self): """ @@ -118,34 +100,23 @@ class TestProtocolInfo(unittest.TestCase): re-establish it. """ - runner = test.runner.get_runner() - - if not runner.is_accessible(): - self.skipTest("(no connection)") - - control_socket = runner.get_tor_socket(False) - - for i in range(5): - protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response) - - control_socket.close() + with test.runner.get_runner().get_tor_socket(False) as control_socket: + for i in range(5): + protocolinfo_response = stem.connection.get_protocolinfo(control_socket) + self.assert_matches_test_config(protocolinfo_response) - def assert_protocolinfo_attr(self, protocolinfo_response): + def assert_matches_test_config(self, protocolinfo_response): """ Makes assertions that the protocolinfo response's attributes match those of - a given connection type. + the test configuration. """ - # This should never have test.runner.TorConnection.NONE. If we somehow got - # a protocolinfo_response from that config then we have an issue. :) - tor_options = test.runner.get_runner().get_options() - - auth_methods = [] + auth_methods, auth_cookie_path = [], None if test.runner.Torrc.COOKIE in tor_options: auth_methods.append(stem.connection.AuthMethod.COOKIE) + auth_cookie_path = test.runner.get_runner().get_auth_cookie_path() if test.runner.Torrc.PASSWORD in tor_options: auth_methods.append(stem.connection.AuthMethod.PASSWORD) @@ -155,10 +126,5 @@ class TestProtocolInfo(unittest.TestCase): self.assertEqual((), protocolinfo_response.unknown_auth_methods) self.assertEqual(tuple(auth_methods), protocolinfo_response.auth_methods) - - auth_cookie_path = None - if test.runner.Torrc.COOKIE in tor_options: - auth_cookie_path = test.runner.get_runner().get_auth_cookie_path() - self.assertEqual(auth_cookie_path, protocolinfo_response.cookie_path)

1 0

[stem/master] Removing pydocs from test classes
by atagar＠torproject.org 29 Jan '12

29 Jan '12

commit 92cf5eb531ab7bfda4361f15b8c5eba92b2050f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 28 10:54:08 2012 -0800 Removing pydocs from test classes The documentation in the headers and classes for unit and integ tests were redundant. Joining the two and removing pydoc blocks from the tet classes. --- test/integ/connection/authentication.py | 5 ----- test/integ/connection/connect.py | 5 ----- test/integ/connection/protocolinfo.py | 5 ----- test/integ/socket/control_message.py | 4 ---- test/integ/util/conf.py | 4 ---- test/integ/util/system.py | 9 ++------- test/integ/version.py | 8 ++------ test/unit/connection/authentication.py | 16 +++++++--------- test/unit/connection/protocolinfo.py | 4 ---- test/unit/socket/control_line.py | 4 ---- test/unit/socket/control_message.py | 5 ----- test/unit/util/conf.py | 4 ---- test/unit/util/enum.py | 4 ---- test/unit/util/system.py | 4 ---- test/unit/version.py | 4 ---- 15 files changed, 11 insertions(+), 74 deletions(-) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 886fbb8..bc94ead 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -24,11 +24,6 @@ INCORRECT_COOKIE_FAIL = "Authentication failed: Authentication cookie did not ma INCORRECT_PASSWORD_FAIL = "Authentication failed: Password did not match HashedControlPassword value from configuration" class TestAuthenticate(unittest.TestCase): - """ - Tests the authentication methods. This should be run with the 'RUN_ALL' - integ target to exercise the widest range of use cases. - """ - def setUp(self): # none of these tests apply if there's no control connection if not test.runner.get_runner().is_accessible(): diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index fb13d20..00b0e04 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -10,11 +10,6 @@ import stem.connection import test.runner class TestConnect(unittest.TestCase): - """ - Tests the connection methods. This should be run with the 'RUN_ALL' integ - target to exercise the widest range of use cases. - """ - def setUp(self): # none of these tests apply if there's no control connection if not test.runner.get_runner().is_accessible(): diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 51076a2..6c9519e 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -11,11 +11,6 @@ import stem.connection import stem.util.system class TestProtocolInfo(unittest.TestCase): - """ - Queries and parses PROTOCOLINFO. This should be run with the 'RUN_ALL' - integ target to exercise the widest range of use cases. - """ - def tearDown(self): # resets call mocking back to being disabled stem.util.system.CALL_MOCKING = None diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index 33a54bf..ec99edb 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -11,10 +11,6 @@ import stem.version import test.runner class TestControlMessage(unittest.TestCase): - """ - Exercises the 'stem.socket.ControlMessage' class with an actual tor instance. - """ - def test_unestablished_socket(self): """ Checks message parsing when we have a valid but unauthenticated socket. diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index e6dfedb..b589761 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -41,10 +41,6 @@ multiline.entry.squashed_bottom """ class TestConf(unittest.TestCase): - """ - Tests the stem.util.conf contents. - """ - def tearDown(self): # clears the config contents test_config = stem.util.conf.get_config("integ_testing") diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 986734e..9295e9b 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -1,6 +1,6 @@ """ -Integration tests for the stem.util.system functions in the context of a tor -process. +Integratnio tests for the stem.util.system functions against the tor process +that we're running. """ import os @@ -11,11 +11,6 @@ import test.runner import stem.util.system class TestSystem(unittest.TestCase): - """ - Tests the stem.util.system functions against the tor process that we're - running. - """ - is_extra_tor_running = None def setUp(self): diff --git a/test/integ/version.py b/test/integ/version.py index 9fa7fd8..616ae57 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -1,5 +1,6 @@ """ -Integration tests for tor version parsing. +Tests that the stem.version functions can handle the tor instance we're +running with. """ import unittest @@ -8,11 +9,6 @@ import test.runner import stem.version class TestVersion(unittest.TestCase): - """ - Tests that the stem.version functions can handle the tor instance we're - running with. - """ - def test_get_system_tor_version(self): """ Basic verification checks for the get_system_tor_version() function. diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index 0b3a60e..b3f2a91 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -1,5 +1,12 @@ """ Unit tests for the stem.connection.authenticate function. + +Under the covers the authentiate function really just translates a +PROTOCOLINFO response into authenticate_* calls, then does prioritization +on the exceptions if they all fail. + +This monkey patches the various functions authenticate relies on to exercise +various error conditions, and make sure that the right exception is raised. """ import unittest @@ -28,15 +35,6 @@ def _get_all_auth_method_combinations(): yield tuple(auth_methods) class TestAuthenticate(unittest.TestCase): - """ - Under the covers the authentiate function really just translates a - PROTOCOLINFO response into authenticate_* calls, then does prioritization - on the exceptions if they all fail. - - This monkey patches the various functions authenticate relies on to exercise - various error conditions, and make sure that the right exception is raised. - """ - def setUp(self): mocking.mock(stem.connection.get_protocolinfo, mocking.no_op()) mocking.mock(stem.connection.authenticate_none, mocking.no_op()) diff --git a/test/unit/connection/protocolinfo.py b/test/unit/connection/protocolinfo.py index 0f47fe1..c49e9bb 100644 --- a/test/unit/connection/protocolinfo.py +++ b/test/unit/connection/protocolinfo.py @@ -43,10 +43,6 @@ RELATIVE_COOKIE_PATH = r"""250-PROTOCOLINFO 1 250 OK""" class TestProtocolInfoResponse(unittest.TestCase): - """ - Tests the parsing of ControlMessages for PROTOCOLINFO responses. - """ - def test_convert(self): """ Exercises functionality of the convert method both when it works and diff --git a/test/unit/socket/control_line.py b/test/unit/socket/control_line.py index ceb350f..6e59f43 100644 --- a/test/unit/socket/control_line.py +++ b/test/unit/socket/control_line.py @@ -14,10 +14,6 @@ PROTOCOLINFO_RESPONSE = ( ) class TestControlLine(unittest.TestCase): - """ - Tests methods of the stem.socket.ControlLine class. - """ - def test_pop_examples(self): """ Checks that the pop method's pydoc examples are correct. diff --git a/test/unit/socket/control_message.py b/test/unit/socket/control_message.py index 8bb6fef..37f1cc0 100644 --- a/test/unit/socket/control_message.py +++ b/test/unit/socket/control_message.py @@ -30,11 +30,6 @@ version -- The current version of Tor. """.replace("\n", "\r\n") class TestControlMessage(unittest.TestCase): - """ - Tests methods and functions related to 'stem.socket.ControlMessage'. This uses - StringIO to make 'files' to mock socket input. - """ - def test_ok_response(self): """ Checks the basic 'OK' response that we get for most commands. diff --git a/test/unit/util/conf.py b/test/unit/util/conf.py index 0a31381..9238f7f 100644 --- a/test/unit/util/conf.py +++ b/test/unit/util/conf.py @@ -6,10 +6,6 @@ import unittest import stem.util.conf class TestConf(unittest.TestCase): - """ - Tests the stem.util.conf contents. - """ - def tearDown(self): # clears the config contents test_config = stem.util.conf.get_config("unit_testing") diff --git a/test/unit/util/enum.py b/test/unit/util/enum.py index 912b64f..b688a27 100644 --- a/test/unit/util/enum.py +++ b/test/unit/util/enum.py @@ -6,10 +6,6 @@ import unittest import stem.util.enum class TestEnum(unittest.TestCase): - """ - Tests the stem.util.enum contents. - """ - def test_to_camel_case(self): """ Checks the stem.util.enum.to_camel_case function. diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 4821073..836b11b 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -72,10 +72,6 @@ def mock_call(base_cmd, responses, command): return responses[cmd_completion] class TestSystem(unittest.TestCase): - """ - Tests the stem.util.system contents. - """ - def setUp(self): test.mocking.mock(stem.util.proc.is_available, test.mocking.return_false()) test.mocking.mock(system.is_available, test.mocking.return_true()) diff --git a/test/unit/version.py b/test/unit/version.py index 787d9c8..5ba7a62 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -6,10 +6,6 @@ import unittest import stem.version class TestVersion(unittest.TestCase): - """ - Tests methods and functions related to 'stem.version.Version'. - """ - def test_parsing(self): """ Tests parsing by the Version class constructor.

1 0

[stem/master] Using mocking module for protocolinfo unit tests
by atagar＠torproject.org 29 Jan '12

29 Jan '12

commit 9a2b50138356f317220819b2351f666bd45564e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 27 18:53:39 2012 -0800 Using mocking module for protocolinfo unit tests Expanding the mocking module to provide a ControlMessage (very frequently needed in tests) and using the module to simplify the protocolinfo unit tests. --- test/mocking.py | 38 +++++++++++++++++++---- test/unit/connection/protocolinfo.py | 54 +++++++++++++++------------------- 2 files changed, 55 insertions(+), 37 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index f6bf98c..0d01a60 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,6 +1,11 @@ """ Helper functions for creating mock objects and monkey patching to help with -testing. +testing. With python's builtin unit testing framework the setUp and test +functions set up mocking, which is then reverted in the tearDown method by +calling 'revert_mocking'. + +mock - replaces a function with an alternative implementation +revert_mocking - reverts any changes made by the mock function Mocking Functions no_op - does nothing @@ -10,10 +15,9 @@ Mocking Functions return_none - returns None raise_exception - raises an exception when called -mock - replaces a function with an alternative implementation -revert_mocking - reverts any changes made by the mock function - -get_protocolinfo_response - provides a ProtocolInfoResponse instance +Instance Constructors + get_message - stem.socket.ControlMessage + get_protocolinfo_response - stem.connection.ProtocolInfoResponse """ import inspect @@ -94,6 +98,27 @@ def revert_mocking(): MOCK_STATE.clear() +def get_message(content, reformat = True): + """ + Provides a ControlMessage with content modified to be parsable. This makes + the following changes unless 'reformat' is false... + - ensures the content ends with a newline + - newlines are replaced with a carrage return and newline pair + + Arguments: + content (str) - base content for the controller message + reformat (str) - modifies content to be more accomidateing to being parsed + + Returns: + stem.socket.ControlMessage instance + """ + + if reformat: + if not content.endswith("\n"): content += "\n" + content = content.replace("\n", "\r\n") + + return stem.socket.recv_message(StringIO.StringIO(content)) + def get_protocolinfo_response(**attributes): """ Provides a ProtocolInfoResponse, customized with the given attributes. The @@ -107,8 +132,7 @@ def get_protocolinfo_response(**attributes): stem.connection.ProtocolInfoResponse instance """ - control_message = "250-PROTOCOLINFO 1\r\n250 OK\r\n" - protocolinfo_response = stem.socket.recv_message(StringIO.StringIO(control_message)) + protocolinfo_response = get_message("250-PROTOCOLINFO 1\n250 OK") stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) for attr in attributes: diff --git a/test/unit/connection/protocolinfo.py b/test/unit/connection/protocolinfo.py index bc0fef3..0f47fe1 100644 --- a/test/unit/connection/protocolinfo.py +++ b/test/unit/connection/protocolinfo.py @@ -3,51 +3,44 @@ Unit tests for the stem.connection.ProtocolInfoResponse class. """ import unittest -import StringIO import stem.connection import stem.socket import stem.version +import test.mocking as mocking NO_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=NULL 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" PASSWORD_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=HASHEDPASSWORD 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" COOKIE_AUTH = r"""250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE COOKIEFILE="/tmp/my data\\\"dir//control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" MULTIPLE_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE,HASHEDPASSWORD COOKIEFILE="/home/atagar/.tor/control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" UNKNOWN_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=MAGIC,HASHEDPASSWORD,PIXIE_DUST 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" MINIMUM_RESPONSE = """250-PROTOCOLINFO 5 -250 OK -""".replace("\n", "\r\n") +250 OK""" RELATIVE_COOKIE_PATH = r"""250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE COOKIEFILE="./tor-browser_en-US/Data/control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" class TestProtocolInfoResponse(unittest.TestCase): """ @@ -61,7 +54,7 @@ class TestProtocolInfoResponse(unittest.TestCase): """ # working case - control_message = stem.socket.recv_message(StringIO.StringIO(NO_AUTH)) + control_message = mocking.get_message(NO_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) # now this should be a ProtocolInfoResponse (ControlMessage subclass) @@ -69,14 +62,15 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertTrue(isinstance(control_message, stem.connection.ProtocolInfoResponse)) # exercise some of the ControlMessage functionality + raw_content = (NO_AUTH + "\n").replace("\n", "\r\n") + self.assertEquals(raw_content, control_message.raw_content()) self.assertTrue(str(control_message).startswith("PROTOCOLINFO 1")) - self.assertEquals(NO_AUTH, control_message.raw_content()) # attempt to convert the wrong type self.assertRaises(TypeError, stem.connection.ProtocolInfoResponse.convert, "hello world") # attempt to convert a different message type - bw_event_control_message = stem.socket.recv_message(StringIO.StringIO("650 BW 32326 2856\r\n")) + bw_event_control_message = mocking.get_message("650 BW 32326 2856") self.assertRaises(stem.socket.ProtocolError, stem.connection.ProtocolInfoResponse.convert, bw_event_control_message) def test_no_auth(self): @@ -84,7 +78,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response when there's no authentication. """ - control_message = stem.socket.recv_message(StringIO.StringIO(NO_AUTH)) + control_message = mocking.get_message(NO_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals(1, control_message.protocol_version) @@ -98,7 +92,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with password authentication. """ - control_message = stem.socket.recv_message(StringIO.StringIO(PASSWORD_AUTH)) + control_message = mocking.get_message(PASSWORD_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.PASSWORD, ), control_message.auth_methods) @@ -108,7 +102,7 @@ class TestProtocolInfoResponse(unittest.TestCase): characters. """ - control_message = stem.socket.recv_message(StringIO.StringIO(COOKIE_AUTH)) + control_message = mocking.get_message(COOKIE_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.COOKIE, ), control_message.auth_methods) self.assertEquals("/tmp/my data\\\"dir//control_auth_cookie", control_message.cookie_path) @@ -118,7 +112,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with multiple authentication methods. """ - control_message = stem.socket.recv_message(StringIO.StringIO(MULTIPLE_AUTH)) + control_message = mocking.get_message(MULTIPLE_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.COOKIE, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) self.assertEquals("/home/atagar/.tor/control_auth_cookie", control_message.cookie_path) @@ -128,7 +122,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with an unrecognized authtentication method. """ - control_message = stem.socket.recv_message(StringIO.StringIO(UNKNOWN_AUTH)) + control_message = mocking.get_message(UNKNOWN_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.UNKNOWN, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) self.assertEquals(("MAGIC", "PIXIE_DUST"), control_message.unknown_auth_methods) @@ -139,7 +133,7 @@ class TestProtocolInfoResponse(unittest.TestCase): information to be a valid response. """ - control_message = stem.socket.recv_message(StringIO.StringIO(MINIMUM_RESPONSE)) + control_message = mocking.get_message(MINIMUM_RESPONSE) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals(5, control_message.protocol_version) @@ -162,23 +156,23 @@ class TestProtocolInfoResponse(unittest.TestCase): def call_mocking(command): if command == stem.util.system.GET_PID_BY_NAME_PGREP % "tor": return ["10"] - if command == stem.util.system.GET_CWD_PWDX % 10: + elif command == stem.util.system.GET_CWD_PWDX % 10: return ["10: /tmp/foo"] - stem.util.system.CALL_MOCKING = call_mocking + mocking.mock(stem.util.system.call, call_mocking) - control_message = stem.socket.recv_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + control_message = mocking.get_message(RELATIVE_COOKIE_PATH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals("/tmp/foo/tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_path) # exercise cookie expansion where both calls fail (should work, just # leaving the path unexpanded) - stem.util.system.CALL_MOCKING = lambda cmd: None - control_message = stem.socket.recv_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + mocking.mock(stem.util.system.call, mocking.return_none()) + control_message = mocking.get_message(RELATIVE_COOKIE_PATH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals("./tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_path) # reset system call mocking - stem.util.system.CALL_MOCKING = None + mocking.revert_mocking()

1 0

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

28 Jan '12

commit bd155028cbc345b3037367090280c28763bc0fcc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 04:15:17 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 12 ++++++------ ru/vidalia_ru.po | 15 ++++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 1d55b01..a25c4bc 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:33+0000\n" +"PO-Revision-Date: 2012-01-29 03:53+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1924,15 +1924,15 @@ msgstr "خواهشمند است تنظیمات احرازهویت پورتِ ک msgctxt "MainWindow" msgid "Tor Update Available" -msgstr "به روز رسانی تُر موجود می باشد" +msgstr "به روز رسانی برای تور موجود است" msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended. Please visit the Tor website to download the latest version." msgstr "" -"نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر " -"رفته و نهایی ترین نسخه آن را بارگذاری کنید." +"نسخه نصب شده تور قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تور " +"رفته و آخرین نسخه را بارگذاری کنید." msgctxt "MainWindow" msgid "Tor website: %1" @@ -1975,7 +1975,7 @@ msgstr "برپای بازپخش\n" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "برپا کردن یک بازپخش به منظور کمک و همکاری کردن در رشد شبکه" +msgstr "یک بازپخش راه‌اندازی و به رشد شبکه کمک کنید" msgctxt "MainWindow" msgid "View the Network" @@ -1983,7 +1983,7 @@ msgstr "مشاهده شبکه" msgctxt "MainWindow" msgid "View a map of the Tor network" -msgstr "مشاهده نقشه شبکه تُر" +msgstr "مشاهده نقشه شبکه تور" msgctxt "MainWindow" msgid "Use a New Identity" diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index 3f5012d..9b84607 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,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:44+0000\n" +"PO-Revision-Date: 2012-01-29 03:50+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" @@ -1316,6 +1316,9 @@ msgid "" "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." msgstr "" +"Отчет об аварийном завершении был создан и вы можете отправить его " +"разработчикам Vidalia что бы помочь им найти и устранить ошибку. " +"Отправляемый отчет не содержит какой-либо персональной информации." msgctxt "CrashReportDialog" msgid "" @@ -2117,7 +2120,7 @@ msgstr "" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "Начальная загрузка Tor от %1 до %2" msgctxt "MainWindow" msgid "" @@ -2141,17 +2144,19 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(вероятно Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(вероятно email клиент)" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." msgstr "" +"Похоже, что одно из ваших приложений %1 создает потенциально не " +"зашифрованное и небезопасное соединение на порт %2." msgctxt "MessageLog" msgid "Error Setting Filter" @@ -3873,7 +3878,7 @@ msgstr "" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Требуется задать значение параметра:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

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

28 Jan '12

commit a845040c8af7a31d9175ae3632ea162dd04a4016 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:45:21 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 8 ++-- ru/vidalia_ru.po | 148 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 86 insertions(+), 70 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 21c7ea8..1d55b01 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-28 13:29+0000\n" +"PO-Revision-Date: 2012-01-29 03:33+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1916,11 +1916,11 @@ msgstr "خطای احرازهویت" msgctxt "MainWindow" msgid "Vidalia was unable to authenticate to the Tor software. (%1)" -msgstr "ویدالیا قادر به احرازهویت درنرم افزار تُر نشد. (%1)" +msgstr "ویدالیا قادر به احرازهویت به نرم افزار تور نشد. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings." -msgstr "خواهشمند است پارامترهای احرازهویت درگاه کنترل خود را چک کنید." +msgstr "خواهشمند است تنظیمات احرازهویت پورتِ کنترل خود را چک کنید." msgctxt "MainWindow" msgid "Tor Update Available" @@ -1936,7 +1936,7 @@ msgstr "" msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "وب سایت تُر: %1" +msgstr "وب سایت تور: %1" msgctxt "MainWindow" msgid "" diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index d13a7be..3f5012d 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,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:14+0000\n" +"PO-Revision-Date: 2012-01-29 03:44+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" @@ -182,26 +182,28 @@ msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Путь к заданной папке данных Tor содержит символы которые не могут быть " +"представлены в текущей 8-битной кодировке вашей системы." msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Предупреждение" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "Вы изменили путь torrc, хотите перезапустить Tor?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Файл конфигурации Tor (torrc);;Все файлы (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "Выберите файл для использования для пути сокета Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Настроить ControlPort автоматически" msgctxt "AdvancedPage" msgid "" @@ -1170,7 +1172,7 @@ msgstr "Зимбабве" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Заир" msgctxt "CountryInfo" msgid "Albania" @@ -1270,39 +1272,43 @@ msgstr "Тайвань" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Отправить информацию об аварийном завершении" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia совершила ошибку и требует завершения" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Перезапустить Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Не перезапускать" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Невозможно перезапустить Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Мы не смогли автоматически перезапустить Vidalia. Пожалуйста, перезапустите " +"Vidalia вручную." 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 "" @@ -1596,27 +1602,27 @@ msgstr "Неизвестно" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Отладка" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Инфа" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Замечание" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Предупреждение" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Ошибка" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Неизвестно" msgctxt "MainWindow" msgid "Start Tor" @@ -2093,6 +2099,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Любая информация отправленная через это это соединение может быть " +"просмотрена. Пожалуйста, проверьте настройки вашей программы и используйте " +"только шифрующие протоколы, типа SSL, если это возможно." msgctxt "MainWindow" msgid "failed (%1)" @@ -2400,15 +2409,15 @@ msgstr "Автоматически сохранять новые сообщен msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Основное" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Статус Tor" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Расширенные" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2698,31 +2707,31 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Адрес:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Тип:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Необходимо выбрать тип прокси." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3162,11 +3171,11 @@ msgstr "<a href=\"#bridgeUsage\">Кто использовал мой мост?< msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Что это?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Автоматически распространять адрес моего моста" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3269,19 +3278,19 @@ msgstr "Создано Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Скопировать с буфер обмена" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor запущен" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Вы используете версию \"%1\" Tor." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor не запущен" msgctxt "StatusEventWidget" msgid "" @@ -3308,11 +3317,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Ваша версия Tor устарела" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Связь с сетью Tor установлена" msgctxt "StatusEventWidget" msgid "" @@ -3322,7 +3331,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Ошибка Tor" msgctxt "StatusEventWidget" msgid "" @@ -3348,7 +3357,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "Время вашего компьютера возможно не верно." msgctxt "StatusEventWidget" msgid "" @@ -3367,7 +3376,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "Возможно опасное соединение!" msgctxt "StatusEventWidget" msgid "" @@ -3379,7 +3388,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "Неизвестный протокол SOCKS" msgctxt "StatusEventWidget" msgid "" @@ -3390,7 +3399,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "Неверное имя хоста назначения" msgctxt "StatusEventWidget" msgid "" @@ -3401,7 +3410,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "Внешний IP адрес изменен" msgctxt "StatusEventWidget" msgid "" @@ -3412,7 +3421,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "Обнаружен взлом DNS" msgctxt "StatusEventWidget" msgid "" @@ -3430,7 +3439,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "Проверяется доступность порта сервера" msgctxt "StatusEventWidget" msgid "" @@ -3441,15 +3450,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "Проверка доступности порта сервера завершена успешно!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Порт вашего сервера ретрансляции доступен в сети Tor!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "Проверка доступности порта сервера провалилась!" msgctxt "StatusEventWidget" msgid "" @@ -3461,7 +3470,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "Проверяется доступность порта директории" msgctxt "StatusEventWidget" msgid "" @@ -3469,18 +3478,21 @@ msgid "" "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." msgstr "" +"Tor пытается определить доступен ли порт вашей директории ретрансляции в " +"сети Tor, путем соединения с сами собой на %1:%2. Этот тест может занять " +"несколько минут." 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 "Порт вашей директории ретрансляции доступен в сети Tor!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "Проверка доступности порта директории провалилась!" msgctxt "StatusEventWidget" msgid "" @@ -3502,7 +3514,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "Ваш ретранслятор в сети" msgctxt "StatusEventWidget" msgid "" @@ -3566,65 +3578,69 @@ 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 "" +"Сохранить настройки. Если не выбрано, настройки будут применены только к " +"текущему запуску Tor." msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Вырезать" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Копировать" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Вставить" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Отменить" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Повторить" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Выбрать всё" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "Применить всё" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "Применить выбранное" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "Ошибка соединения с Tor" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" msgstr "" +"Выбранная область пуста. Пожалуйста, выберите необходимый текст, или нажмите" +" \"Применить всё\"" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "Ошибка в строке %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Ошибка" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "Произошла ошибка во время открытия файла torrc" msgctxt "UPNPControl" msgid "Success"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit 6a7ebde80e47eccdd0560fcba296d5fdca7dbcd8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:15:23 2012 +0000 Update translations for vidalia_help --- ru/running.po | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ru/running.po b/ru/running.po index 7918279..43429ed 100644 --- a/ru/running.po +++ b/ru/running.po @@ -1,13 +1,14 @@ # # Translators: +# <liquixis(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-29 03:03+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" @@ -27,8 +28,8 @@ msgid "" "Tor, as well as monitoring Tor's status and letting you know if it exits " "unexpectedly." msgstr "" -"Vidalia поможет вам контролировать процесс Tor начиная с запуска заканчивая " -"остановкой, так же мониторинг статуса Tor и даст вам знать если Tor будет " +"Vidalia поможет вам управлять процессом Tor, позволяя запускать и " +"останавливать Tor, а так же наблюдать статус Tor и сообщит если Tor будет " "неожиданно завершен." #. type: Content of: <html><body> @@ -44,7 +45,7 @@ msgstr "Запуск и остановка Tor." #. type: Content of: <html><body> #: en/running.html:28 msgid "To start Tor," -msgstr "Для запуска Tor." +msgstr "Для запуска Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:30 @@ -55,7 +56,7 @@ msgstr "" #. type: Content of: <html><body><ol> #: en/running.html:30 en/running.html:45 msgid "." -msgstr "" +msgstr "." #. type: Content of: <html><body><ol><li> #: en/running.html:32 @@ -64,7 +65,7 @@ msgid "" "when Tor has started." msgstr "" "Иконка в трее Vidalia изменится со значка лука с красным X на зеленый лук " -"тогда Tor запустился." +"тогда Tor запустится." #. type: Content of: <html><body> #: en/running.html:36 @@ -82,7 +83,7 @@ msgstr "" #. type: Content of: <html><body> #: en/running.html:43 msgid "To stop Tor," -msgstr "Для остановки Tor." +msgstr "Для остановки Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:45 @@ -175,8 +176,8 @@ msgid "" "about any problems Tor encountered before it exited." msgstr "" "Если Tor завершился неожидано.Vidalia сменит иконку на темную луковку с " -"красным X и отобразить ошибку с описанием проблемы.Вы так же можете " +"красным X и отобразить ошибку с описанием проблемы. Вы так же можете " "просмотреть <a href=\"log.html\">журнал сообщений</a> для более детальной " -"информации о проблеме которая спровоцировала выход." +"информации о возможных проблемах произошедших перед завершением Tor."

1 0

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

28 Jan '12

commit 1ce9d09b264bbddad2fa6d617765beae484775aa Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:15:16 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index f253621..d13a7be 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -1,14 +1,15 @@ # # Translators: # axe <axe.rode(a)ymail.com>, 2011. +# <liquixis(a)gmail.com>, 2012. # Андрей Костенко <andrey(a)kostenko.name>, 2011. msgid "" 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: 2011-09-08 00:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-29 03:14+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" @@ -142,37 +143,39 @@ msgstr "" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Управление Tor" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Использовать TCP соединение (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Путь:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Использовать Unix domain socket (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Редактировать текущий torrc" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "ПРИМЕЧАНИЕ: это изменит загруженный на данный момент torrc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "Путь ControlSocket не существует." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"Путь к заданному файлу конфигурации Tor содержит символы которые не могут " +"быть представлены в текущей 8-битной кодировке вашей системы." msgctxt "AdvancedPage" msgid ""

1 0

r25357: {website} obfsproxy instructions update from asn (website/trunk/projects/en)
by Sebastian Hahn 28 Jan '12

28 Jan '12

Author: sebastian Date: 2012-01-28 14:08:25 +0000 (Sat, 28 Jan 2012) New Revision: 25357 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: obfsproxy instructions update from asn Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 19:19:40 UTC (rev 25356) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-28 14:08:25 UTC (rev 25357) @@ -59,22 +59,22 @@ - Set up your Tor configuration file: - User tor - PIDFile /usr/local/var/run/tor/tor.pid - SocksPort 1999 # what port to open for local application connections - Log notice file /usr/local/var/log/tor/tor.log - DataDirectory /usr/local/var/lib/tor/data - UseBridges 1 - Bridge obfs2 192.0.2.34:34545 - ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Add the appropriate lines to your tor configuration file: - Replace 192.0.2.34 with the bridge supporting obfsproxy you - wish to use and 34545 with the port number the bridge uses. + + <tt> UseBridges 1 </tt> + <tt> Bridge obfs2 192.0.2.34:34545 </tt> + <tt> ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + Don't forget to replace 192.0.2.34 with the IP address of + the bridge you wish to use, and 34545 with the port + obfpsroxy is listening on. + + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the torrc file: @@ -98,17 +98,15 @@ - Set up your Tor configuration file: - User tor - PIDFile /usr/local/var/run/tor/tor.pid - ORPort 4367 - Log notice file /usr/local/var/log/tor/tor.log - DataDirectory /usr/local/var/lib/tor/data - BridgeRelay 1 - ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Add the appropriate lines to your tor configuration file: + <tt> BridgeRelay 1 </tt> + <tt> ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the torrc file: @@ -119,7 +117,7 @@ - Next, Find the TCP port opened by obfsproxy. Look in your log file + Next, find the TCP port opened by obfsproxy. Look in your log file for a line similar to this one: <img src="$(IMGROOT)/obfs-log_checking.png" alt="bridge torrc" width="437" height="14"></a>

1 0

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

28 Jan '12

commit c362dd8401960653e058834a355982ef9f68fc8d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 13:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index e9dc897..21c7ea8 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-27 06:43+0000\n" +"PO-Revision-Date: 2012-01-28 13:29+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1883,7 +1883,7 @@ msgid "" "The Tor software requires Vidalia to send the contents of an authentication " "cookie, but Vidalia was unable to find one." msgstr "" -"نرم افزار تُر نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد " +"نرم افزار تور نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد " "اما ویدالیا نتوانست آن را پیدا کند." msgctxt "MainWindow"

1 0