- tor-commits - lists.torproject.org

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

30 Jan '12

commit 213ec82e9773bfd9310b99e52ab772a721a9b14b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 20:45:17 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index dade75e..e920ac6 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-30 19:38+0000\n" +"PO-Revision-Date: 2012-01-30 20:28+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3560,6 +3560,10 @@ msgid "" "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." msgstr "" +"دایرکتوری پورت بازپخش کننده شما، توسط دیگر کاربران تور قابل دسترس نیست. این " +"اتفاق زمانی ممکن است بیافتد، که شما پشت روتر یا فایروالی هستید که نیاز به " +"تنظیم انتقال پورت دارد. اگر %1:%2 آدرس IP و دایرکتوری پورت درست شما نیست، " +"لطفن پیکربندی بازپخش کننده خود را چک کنید." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" @@ -3666,11 +3670,11 @@ msgstr "چسباندن" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "اصلاح" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "انجام مجدد" msgctxt "TorrcDialog" msgid "Select All"

1 0

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

30 Jan '12

commit 6d0da863ce6f9a152c3589b8c4adb159d9b83b8f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 19:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 7620610..dade75e 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-30 17:08+0000\n" +"PO-Revision-Date: 2012-01-30 19:38+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1319,12 +1319,17 @@ msgid "" "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." msgstr "" +"گزارش از کار افتادن نرم افزار آماده شده و شما میتوانید آن را برای کمک به " +"شناسایی و حل مشکل به توسعه دهندگان ویدالیا ارسال کنید. گزارش ثبت شده حاوی " +"هیچگونه اطلاعات هویتی شخصی نیست." msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" msgstr "" +"با شرحی از آنچه قبل ازکار افتادن نرم افزار انجام می‌دادید، بهمراه فایلهای " +"مربوط به گزارش از کار افتادن:" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -3459,6 +3464,8 @@ msgid "" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." msgstr "" +"تور تشخیص داده که آدرس IP شما در حال حاضر %1%2 است. اگر درست نیست، لطفن " +"تنظیم 'Address' را در پیکربندی بازپخش کننده خود در نظر داشته باشید." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" @@ -3531,6 +3538,8 @@ msgid "" "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." msgstr "" +"تور در حال بررسی دسترسی پورت دایرکتوری بازپخش کننده شما، از داخل شبکه تور، " +"به وسیله وصل خود در %1:%2 است. این آزمایش ممکن است چند دقیقه طول بکشد." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!"

1 0

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

30 Jan '12

commit 8d7bad2023cd7d4dcf620d5fb8fdded2b2fde1c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 17:15:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 20e8380..7620610 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-30 16:02+0000\n" +"PO-Revision-Date: 2012-01-30 17:08+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2150,6 +2150,8 @@ 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" @@ -3921,7 +3923,7 @@ msgstr "ناتوان در بازکردن فایل تاریخچه ثبت '%1': % 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 30 Jan '12

30 Jan '12

commit 50f482c3fc90fa0c31a3dbc42e636c5fb8903531 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 16:15:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 2b9c982..20e8380 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-30 15:43+0000\n" +"PO-Revision-Date: 2012-01-30 16:02+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -203,7 +203,7 @@ msgstr "انتخاب فایل به مسیر سوکت از Tor استفاده ک msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "پورتِ کنترل را بصورت خودکار پیکربندی کن" msgctxt "AdvancedPage" msgid "" @@ -2116,7 +2116,7 @@ msgstr "باز ژخش شما متوقف شده است./n" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "راه اندازی torrc از %1 به %2" msgctxt "MainWindow" msgid "" @@ -2139,11 +2139,11 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(شاید تِل‌نت)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(شاید یک برنامه ایمیل)" msgctxt "MainWindow" msgid "" @@ -3552,13 +3552,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "واصف بازپخش رد شد" +msgstr "واصف بازپخش کننده رد شد" msgctxt "StatusEventWidget" msgid "" "Your relay's descriptor, which enables clients to connect to your relay, was" " rejected by the directory server at %1:%2. The reason given was: %3" msgstr "" +"واصف بازپخش کننده شما، که کاربران را قادر به اتصال به بازپخش کننده شما " +"میکند، توسط سرور داده ها در %1:%2 رد شد. علت: %3" msgctxt "StatusEventWidget" msgid "Your Relay is Online" @@ -3571,6 +3573,9 @@ msgid "" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" msgstr "" +"بازپخش کننده شما آنلاین و برای استفاده کاربران تور در دسترس است. همچنان که " +"کاربران بیشتری از بازپخش کننده شما آگاه میشوند، در چند ساعت آینده، شما باید " +"شاهد بالا رفتن ترافیک نمایش داده شده در نمودار پهنای باند باشید!" msgctxt "Stream" msgid "New"

1 0

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

30 Jan '12

commit c94189da88aa6e16b3f3eb49f30e41fb308dbb16 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 15:45:17 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 d98b1ed..2b9c982 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:19+0000\n" +"PO-Revision-Date: 2012-01-30 15:43+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3552,7 +3552,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "" +msgstr "واصف بازپخش رد شد" msgctxt "StatusEventWidget" msgid ""

1 0

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

30 Jan '12

commit 77065a67b058a3fb42786e799b2adfb3b49e96c9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 11:15:18 2012 +0000 Update translations for vidalia_help --- it/services.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/it/services.po b/it/services.po index fd3d6a8..9a7442c 100644 --- a/it/services.po +++ b/it/services.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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-01-30 10:43+0000\n" +"PO-Revision-Date: 2012-01-30 11:01+0000\n" "Last-Translator: Marco <>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,9 @@ msgstr "Che dati devo fornire?" msgid "" "The services table contains five columns containing data about configured " "hidden services:" -msgstr "La tavola dei servizi " +msgstr "" +"La tavola dei servizi contiene cinque colonne che a loro volta contenengono " +"dati sui servizi nascosti configurati." #. type: Content of: <html><body><p><ul><li> #: en/services.html:61 @@ -233,6 +235,9 @@ msgid "" " forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." msgstr "" +"Tor permette la configurazione di impostazioni specifiche per servizi " +"nascosti, ad esempio forzare l'uso (o evitare) di certi nodi come punto di " +"introduzione, o fornendo porte virtuali multiple per lo stesso servizio." #. type: Content of: <html><body><p> #: en/services.html:128 @@ -243,6 +248,11 @@ msgid "" " are editing your hidden services. If you specify more than one virtual " "port, only the first will be displayed and be editable." msgstr "" +"Comunque sia, abbiamo deciso di semplificare le cose in Vidalia e fornire " +"solo le impostazioni più conosciute. Se vuoi configurare quelle avanzate, " +"devi farlo nel file torrc di Tor. Vidalia non rimuoverà queste impostazioni " +"nemmeno quando stai modificando i tuoi servizi nascosti. Se specifichi più " +"di una porta virtuale, solo la prima sarà visualizzata e modificabile." #. type: Content of: <html><body> #: en/services.html:135

1 0

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

30 Jan '12

commit 78d04ffdd772a3042a07bb08ec2e054ec6bca52b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 30 10:45:18 2012 +0000 Update translations for vidalia_help --- it/services.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/it/services.po b/it/services.po index 848894e..fd3d6a8 100644 --- a/it/services.po +++ b/it/services.po @@ -3,13 +3,14 @@ # <balelo(a)mailforspam.com>, 2011. # Luca <luca(a)jeckodevelopment.it>, 2011. # <lukefiltroman(a)gmail.com>, 2011. +# Marco <>, 2012. 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: 2011-12-16 17:12+0000\n" -"Last-Translator: Balelo <balelo(a)mailforspam.com>\n" +"PO-Revision-Date: 2012-01-30 10:43+0000\n" +"Last-Translator: Marco <>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +112,7 @@ msgstr "Che dati devo fornire?" msgid "" "The services table contains five columns containing data about configured " "hidden services:" -msgstr "" +msgstr "La tavola dei servizi " #. type: Content of: <html><body><p><ul><li> #: en/services.html:61

1 0

r25360: {website} Noting the django torstatus on the volunteer page We'd prefe (website/trunk/getinvolved/en)
by Damian Johnson 30 Jan '12

30 Jan '12

Author: atagar Date: 2012-01-30 08:20:07 +0000 (Mon, 30 Jan 2012) New Revision: 25360 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Noting the django torstatus on the volunteer page We'd prefer for new volunteers to hack on the new django codebase rather continue the php counterpart. Changing the entry in on the volunteer page to indicate that both exist. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-01-29 13:35:00 UTC (rev 25359) +++ website/trunk/getinvolved/en/volunteer.wml 2012-01-30 08:20:07 UTC (rev 25360) @@ -204,7 +204,7 @@ <tr class="alt"> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> - <td>PHP</td> + <td>Python, Django</td> <td>None</td> <td></td> </tr> @@ -499,12 +499,15 @@ <a id="project-torstatus"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/TorStatus">TorStatus</a> (<a - href="https://svn.torproject.org/svn/torstatus/trunk/">code</a>)</h3> + href="https://gitweb.torproject.org/torstatus.git">code</a>)</h3> <p> Portal providing an overview of the Tor network, and details on any of its current relays. Though very actively used, this project has been - unmaintained for a long while. + unmaintained for a long while. The <a + href="https://svn.torproject.org/svn/torstatus/trunk/">original + codebase</a> was written in PHP, and students from Wesleyan wrote the new + Django counterpart. </p> <a id="project-weather"></a>

1 0

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

30 Jan '12

commit 0f913df18423f84650b27144f2a89fb9997349ab Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 29 15:05:05 2012 -0800 Refactoring conf integ tests --- test/integ/util/conf.py | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index b589761..9eca724 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -3,25 +3,24 @@ Integration tests for the stem.util.conf class and functions. """ import os -import tempfile import unittest import stem.util.conf +import test.runner -CONF_PATH = tempfile.mktemp("-conf-test") CONF_HEADER = """# Demo configuration for integration tests to run against. Nothing to see here, # move along, move along. """ -EXAMPLE_CONF = """%s +EXAMPLE_CONF = """ destination.ip 1.2.3.4 destination.port blarg startup.run export PATH=$PATH:~/bin startup.run alias l=ls -""" % CONF_HEADER +""" -MULTILINE_CONF = """%s +MULTILINE_CONF = """ multiline.entry.simple |la de da |and a ho hum @@ -40,6 +39,23 @@ multiline.entry.squashed_bottom |and a ho hum """ +def _get_test_config_path(): + return os.path.join(test.runner.get_runner().get_test_dir(), "integ_test_cfg") + +def _make_config(contents): + """ + Writes a test configuration to disk, returning the path where it is located. + """ + + test_config_path = _get_test_config_path() + + test_conf_file = open(test_config_path, "w") + test_conf_file.write(CONF_HEADER) + test_conf_file.write(contents) + test_conf_file.close() + + return test_config_path + class TestConf(unittest.TestCase): def tearDown(self): # clears the config contents @@ -48,26 +64,25 @@ class TestConf(unittest.TestCase): test_config.clear_listeners() # cleans up test configurations we made - if os.path.exists(CONF_PATH): - os.remove(CONF_PATH) + test_config_path = _get_test_config_path() + + if os.path.exists(test_config_path): + os.remove(test_config_path) def test_example(self): """ Checks that the pydoc example is correct. """ - test_conf_file = open(CONF_PATH, "w") - test_conf_file.write(EXAMPLE_CONF) - test_conf_file.close() - ssh_config = {"login.user": "atagar", "login.password": "pepperjack_is_awesome!", "destination.ip": "127.0.0.1", "destination.port": 22, "startup.run": []} + test_config_path = _make_config(EXAMPLE_CONF) user_config = stem.util.conf.get_config("integ_testing") - user_config.load(CONF_PATH) + user_config.load(test_config_path) user_config.synchronize(ssh_config) self.assertEquals("atagar", ssh_config["login.user"]) @@ -81,12 +96,9 @@ class TestConf(unittest.TestCase): Tests the load method with multi-line configuration files. """ - test_conf_file = open(CONF_PATH, "w") - test_conf_file.write(MULTILINE_CONF) - test_conf_file.close() - + test_config_path = _make_config(MULTILINE_CONF) test_config = stem.util.conf.get_config("integ_testing") - test_config.load(CONF_PATH) + test_config.load(test_config_path) for entry in ("simple", "leading_whitespace", "squashed_top", "squashed_bottom"): self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry))

1 0

[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