- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '11

30 Dec '11

commit df69f560cbfa16142497ae8ee5808a76a7d4217f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 20:45:15 2011 +0000 Update translations for vidalia_help --- fa/server.po | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fa/server.po b/fa/server.po index 3b22222..a05ddc0 100644 --- a/fa/server.po +++ b/fa/server.po @@ -7,7 +7,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: 2011-12-30 19:47+0000\n" +"PO-Revision-Date: 2011-12-30 20:33+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -90,6 +90,9 @@ msgid "" "<b>Nickname</b>: The name which your relay will be known as on the Tor " "network. An example of a relay nickname is \"MyVidaliaRelay\"." msgstr "" +"نام مستعار يا <b>Nickname</b>: نامی که بازپخش کننده شما در شبکه تور خواهد " +"داشت. نمونه ای از يک نام مستعار برای بازپخش کننده عبارت است از " +"«MyVidaliaRelay»." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:50 @@ -99,6 +102,10 @@ msgid "" "goes wrong with your relay. You might also include your PGP or GPG key ID " "and fingerprint." msgstr "" +"اطلاعات تماس يا <b>Contact Info</b>: آدرس ايميل شما. اين آدرس فقط در صورتی " +"مورد استفاده قرار می گيرد که يک به روز رسانی امنيتی مهم برای تور لازم باشد و" +" يا مشکلی برای بازپخش کننده شما پيش آمده باشد. علاوه بر ايميل می توانيد اثر " +"انگشت يا ID کليد PGP يا GPG خود را نيز وارد کنيد." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:56 @@ -106,6 +113,8 @@ msgid "" "<b>Relay Port</b>: The port on which your relay will listen for traffic from" " clients or other Tor relays." msgstr "" +"درگاهی بازپخش کننده يا <b>Relay Port</b>: درگاهی که روی آن بازپخش کننده شما " +"دنبال ترافيک از کلاينت ها يا بازپخش کننده های ديگر خواهد بود. " #. type: Content of: <html><body><ol><li> #: en/server.html:62 @@ -227,17 +236,17 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 msgid "<b>Checkbox</b>" -msgstr "" +msgstr "<b>جعبه انتخاب</b>" #. type: Content of: <html><body><table><tr><td> #: en/server.html:139 msgid "<b>Ports</b>" -msgstr "" +msgstr "<b>درگاهی ها</b>" #. type: Content of: <html><body><table><tr><td> #: en/server.html:140 msgid "<b>Description</b>" -msgstr "" +msgstr "<b>توصيف</b>" #. type: Content of: <html><body><table><tr><td> #: en/server.html:143

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '11

30 Dec '11

commit 54fada875f1f4721f982ec91ace24ec34af5727a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 20:15:16 2011 +0000 Update translations for vidalia_help --- fa/server.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fa/server.po b/fa/server.po index d56c07e..3b22222 100644 --- a/fa/server.po +++ b/fa/server.po @@ -7,7 +7,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: 2011-12-30 19:43+0000\n" +"PO-Revision-Date: 2011-12-30 19:47+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -121,12 +121,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:71 msgid "<a name=\"bandwidth\"/>" -msgstr "" +msgstr "<a name=\"bandwidth\"/>" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "محدوديت های پهنای باند" #. type: Content of: <html><body><p> #: en/server.html:74 @@ -148,7 +148,7 @@ msgstr "" #. type: Content of: <html><body><h4> #: en/server.html:84 msgid "Custom Limits" -msgstr "" +msgstr "محدوديت های دلخواه" #. type: Content of: <html><body><p> #: en/server.html:86 @@ -187,12 +187,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:111 msgid "<a name=\"exitpolicy\"/>" -msgstr "" +msgstr "<a name=\"exitpolicy\"/>" #. type: Content of: <html><body><h3> #: en/server.html:112 msgid "Exit Policies" -msgstr "" +msgstr "سياست های خروج" #. type: Content of: <html><body><p> #: en/server.html:114 @@ -356,7 +356,7 @@ msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189 msgid "Port Forwarding" -msgstr "" +msgstr "ارسال به جلوی درگاهی (Port Forwarding)" #. type: Content of: <html><body><p> #: en/server.html:191

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '11

30 Dec '11

commit 376785dcb7f4be7aeb14d70711df7226c63015a8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 19:45:15 2011 +0000 Update translations for vidalia_help --- fa/server.po | 50 +++++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/fa/server.po b/fa/server.po index f255891..d56c07e 100644 --- a/fa/server.po +++ b/fa/server.po @@ -7,7 +7,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: 2011-12-30 19:09+0000\n" +"PO-Revision-Date: 2011-12-30 19:43+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -54,11 +54,15 @@ msgid "" "tray menu or <i>Preferences</i> from your system menubar on Macintosh " "systems." msgstr "" +"ابتدا بايد پنجره تنظيمات يا را باز کنيد. برای اين کار گزينه تنظيمات يا " +"<i>Settings</i> را از منوی نوار ابزار ويندوز انتخاب کنيد و يا اگر سيستم " +"مکينتاش داريد، گزينه ترجيحات يا <i>Preferences</i> را از نوار منوی سيستم خود" +" انتخاب کنيد. " #. type: Content of: <html><body><ol><li> #: en/server.html:35 msgid "Select the <i>Relay</i> configuration page." -msgstr "" +msgstr "صفحه تنظيمات بازپخش کننده يا <i>Relay</i> را انتخاب کنيد. " #. type: Content of: <html><body><ol><li> #: en/server.html:37 @@ -70,6 +74,10 @@ msgid "" "relay or <i>Help censored users reach the Tor network</i> if you want to run" " a bridge relay." msgstr "" +"تصميم بگيريد که می خواهيد يک بازپخش کننده معمولی راه اندازی کنيد يا يک پازپخش کننده پل يا <i>bridge</i> که در نسخه 0.2.0.8-alpha يا جديدتر تور امکان آن وجود دارد. بازپخش کننده های پل به کاربرانی کمک می کنند که گرفتار سانسور شده و نمی توانند مستقيماً به شبکه تور دستيابی پيدا کنند. در صورتی که می خواهيد يک بازپخش کننده معمولی راه اندازی کنيد جعبه با عنوان زير را تيک بزنيد:\n" +"بازپخش کردن ترافيک برای شبکه تور - <i>Relay traffic for the Tor network</i>\n" +"چنانچه می خواهيد يک بازپخش کننده پل راه اندازی کنيد جعبه با عنوان زير را تيک بزنيد:\n" +"کمک به کاربران سانسور شده برای دستيابی به شبکه تور - <i>Help censored users reach the Tor network</i> " #. type: Content of: <html><body><ol><li> #: en/server.html:44 @@ -234,93 +242,93 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:143 msgid "Websites" -msgstr "" +msgstr "وبسايت ها" #. type: Content of: <html><body><table><tr><td> #: en/server.html:144 msgid "80" -msgstr "" +msgstr "80" #. type: Content of: <html><body><table><tr><td> #: en/server.html:145 msgid "Normal, unencrypted Web browsing" -msgstr "" +msgstr "مرورگری وب به شکل معمولی و بدون رمزنگاری" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 msgid "Secure Websites (SSL)" -msgstr "" +msgstr "وبسايت های امن (SSL)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:149 msgid "443" -msgstr "" +msgstr "443" #. type: Content of: <html><body><table><tr><td> #: en/server.html:150 msgid "Encrypted Web browsing" -msgstr "" +msgstr "مرورگری وب به شکل رمزنگاری شده" #. type: Content of: <html><body><table><tr><td> #: en/server.html:153 msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "بازيابی ايميل (POP, IMAP)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:154 msgid "110, 143, 993, 995" -msgstr "" +msgstr "110, 143, 993, 995" #. type: Content of: <html><body><table><tr><td> #: en/server.html:155 msgid "Downloading email (does not permit sending email)" -msgstr "" +msgstr "دانلود ايميل (امکان فرستادن ايميل را فراهم نمی کند)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:158 msgid "Instant Messaging (IM)" -msgstr "" +msgstr "پيام رسانی سريع (IM)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:159 msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" -msgstr "" +msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" #. type: Content of: <html><body><table><tr><td> #: en/server.html:160 msgid "" "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber" -msgstr "" +msgstr "نرم افزاری پيام رسانی سريع مانند MSN Messenger، AIM، ICQ، و Jabber" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163 msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "چت بازپخش شده اينترنتی يا Internet Relay Chat (IRC)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:164 msgid "6660-6669, 6697, 7000-7001" -msgstr "" +msgstr "6660-6669, 6697, 7000-7001" #. type: Content of: <html><body><table><tr><td> #: en/server.html:165 msgid "IRC clients and servers" -msgstr "" +msgstr "کلاينت ها و سرورهای IRC" #. type: Content of: <html><body><table><tr><td> #: en/server.html:168 msgid "Misc. Other Services" -msgstr "" +msgstr "سرويس های متفرقه" #. type: Content of: <html><body><table><tr><td> #: en/server.html:169 msgid "*" -msgstr "" +msgstr "*" #. type: Content of: <html><body><table><tr><td> #: en/server.html:170 msgid "All other applications that aren't covered by the previous checkboxes" -msgstr "" +msgstr "تمام ساير نرم افزارهایی که در پوشش جعبه های فوق قرار نمی گيرند." #. type: Content of: <html><body><p> #: en/server.html:175 @@ -343,7 +351,7 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:188 msgid "<a name=\"upnp\"/>" -msgstr "" +msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Dec '11

30 Dec '11

commit bc88b161e48c7470d78d2fd978781e233ffda6a0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 19:15:16 2011 +0000 Update translations for vidalia_help --- fa/server.po | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fa/server.po b/fa/server.po index f91bd77..f255891 100644 --- a/fa/server.po +++ b/fa/server.po @@ -1,13 +1,14 @@ # # Translators: # <behravanhamed(a)gmail.com>, 2011. +# Reza Pakdel <pakdelreza(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: 2011-06-29 15:23+0000\n" -"Last-Translator: behravan <behravanhamed(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-30 19:09+0000\n" +"Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/server.html:16 msgid "Setting Up a Tor Relay" -msgstr "" +msgstr "راه اندازی يک بازپخش کننده (Relay) تور" #. type: Content of: <html><body> #: en/server.html:19 @@ -27,11 +28,15 @@ msgid "" "of their spare bandwidth by running a Tor relay. Vidalia helps you do your " "part by making it easy to set up a relay of your own. <a name=\"basic\"/>" msgstr "" +"شبکه تور متشکل از داوطلبانی در سراسر دنيا است که با راه اندازی بازپخش کننده " +"تور، مقداری از پهنای باند اضافی خود را به آن اهدا می کنند. ويداليا با آسان " +"ساختن راه اندازی بازپخش کننده برای شما امکان کمک کردن به شبکه تور را برای " +"شما فراهم می کند. <a name=\"basic\"/>" #. type: Content of: <html><body><h3> #: en/server.html:24 msgid "Basic Settings" -msgstr "" +msgstr "تنظيمات پايه" #. type: Content of: <html><body><p> #: en/server.html:26 @@ -39,6 +44,8 @@ msgid "" "If you decide you want to help the Tor network grow by running a relay, you " "can follow these steps to get started:" msgstr "" +"اگر تصميم گرفتيد که می خواهيد با راه اندازی يک بازپخش کننده به رشد شبکه تور " +"کمک کنيد، می توانيد برای شروع اقدامات زير را انجام دهيد:" #. type: Content of: <html><body><ol><li> #: en/server.html:31

1 0

[stem/master] Moving python testing output filters to module
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit d02aa3e9128e92982e6f2760594523556bd45e85 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 28 09:24:35 2011 -0800 Moving python testing output filters to module Rewriting the hacks I was applying to test output for better readability as a proper module. Nicer code and now much easier to add more filters. --- run_tests.py | 34 ++++++-------------- test/__init__.py | 2 +- test/output.py | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 25 deletions(-) diff --git a/run_tests.py b/run_tests.py index 7247dd7..7e3dadb 100755 --- a/run_tests.py +++ b/run_tests.py @@ -12,6 +12,7 @@ import logging import unittest import StringIO +import test.output import test.runner import test.unit.version import test.unit.socket.control_message @@ -94,30 +95,10 @@ TEST_OUTPUT_ATTR = { "... skipped": (term.Color.BLUE,), } -# lines that print_test_results have processed which contained a test failure -PRINTED_ERRORS = [] - def print_divider(msg, is_header = False): attr = HEADER_ATTR if is_header else CATEGORY_ATTR print term.format("%s\n%s\n%s\n" % (DIVIDER, msg.center(70), DIVIDER), *attr) -def print_test_results(test_results): - test_results.seek(0) - for line in test_results.readlines(): - line_attr = DEFAULT_TEST_ATTR - - for result in TEST_OUTPUT_ATTR: - if result in line: - line_attr = TEST_OUTPUT_ATTR[result] - - if result in ("... FAIL", "... ERROR"): - PRINTED_ERRORS.append(line) - - break - - if line_attr: line = term.format(line, *line_attr) - sys.stdout.write(line) - if __name__ == '__main__': start_time = time.time() run_unit_tests = False @@ -193,6 +174,9 @@ if __name__ == '__main__': print + error_tracker = test.output.ErrorTracker() + output_filters = (error_tracker.get_filter(), test.output.colorize, ) + if run_unit_tests: print_divider("UNIT TESTS", True) @@ -201,7 +185,8 @@ if __name__ == '__main__': suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() unittest.TextTestRunner(test_results, verbosity=2).run(suite) - print_test_results(test_results) + + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print print @@ -251,7 +236,8 @@ if __name__ == '__main__': suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() unittest.TextTestRunner(test_results, verbosity=2).run(suite) - print_test_results(test_results) + + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print except OSError: pass @@ -262,10 +248,10 @@ if __name__ == '__main__': runtime_label = "(%i seconds)" % (time.time() - start_time) - if PRINTED_ERRORS: + if error_tracker.has_error_occured(): print term.format("TESTING FAILED %s" % runtime_label, term.Color.RED, term.Attr.BOLD) - for line in PRINTED_ERRORS: + for line in error_tracker: print term.format(" %s" % line, term.Color.RED, term.Attr.BOLD) else: print term.format("TESTING PASSED %s" % runtime_label, term.Color.GREEN, term.Attr.BOLD) diff --git a/test/__init__.py b/test/__init__.py index 9afce0a..a663300 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = ["runner"] +__all__ = ["output", "runner"] diff --git a/test/output.py b/test/output.py new file mode 100644 index 0000000..4b53e52 --- /dev/null +++ b/test/output.py @@ -0,0 +1,93 @@ +""" +Variety of filters for the python unit testing output, which can be chained +together for improved readability. +""" + +import stem.util.enum +import stem.util.term as term + +LineType = stem.util.enum.Enum("OK", "FAIL", "ERROR", "SKIPPED", "CONTENT") + +LINE_ENDINGS = { + "... ok": LineType.OK, + "... FAIL": LineType.FAIL, + "... ERROR": LineType.ERROR, + "... skipped": LineType.SKIPPED, +} + +LINE_ATTR = { + LineType.OK: (term.Color.GREEN,), + LineType.FAIL: (term.Color.RED, term.Attr.BOLD), + LineType.ERROR: (term.Color.RED, term.Attr.BOLD), + LineType.SKIPPED: (term.Color.BLUE,), + LineType.CONTENT: (term.Color.CYAN,), +} + +def apply_filters(testing_output, *filters): + """ + Gets the tests results, possably processed through a series of filters. The + filters are applied in order, each getting the output of the previous. + + A filter's input arguments should be the line's (type, content) and the + output is either a string with the new content or None if the line should be + omitted. + + Arguments: + testing_output (str) - output from the unit testing + filters (list) - functors to be applied to each line of the results + + Returns: + str with the processed test results + """ + + results = [] + + for line in testing_output.split("\n"): + # determine the type of the line + line_type = LineType.CONTENT + + for ending in LINE_ENDINGS: + if line.endswith(ending): + line_type = LINE_ENDINGS[ending] + break + + for result_filter in filters: + line = result_filter(line_type, line) + if line == None: break + + if line != None: + results.append(line) + + return "\n".join(results) + +def colorize(line_type, line_content): + """ + Applies escape sequences so each line is colored according to its type. + """ + + return term.format(line_content, *LINE_ATTR[line_type]) + +class ErrorTracker: + """ + Stores any failure or error results we've encountered. + """ + + def __init__(self): + self._errors = [] + + def has_error_occured(self): + return bool(self._errors) + + def get_filter(self): + def _error_tracker(line_type, line_content): + if line_type in (LineType.FAIL, LineType.ERROR): + self._errors.append(line_content) + + return line_content + + return _error_tracker + + def __iter__(self): + for error_line in self._errors: + yield error_line +

1 0

[stem/master] Expanding success/failure label and other fixes
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit a5023f160e184bb0b800d4789a96c47d411fef2c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 28 17:51:50 2011 -0800 Expanding success/failure label and other fixes Multiple minor fixes and display improvements around how test output is displayed. --- test/output.py | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/test/output.py b/test/output.py index 971aab9..d5e7a6d 100644 --- a/test/output.py +++ b/test/output.py @@ -11,10 +11,10 @@ import stem.util.term as term LineType = stem.util.enum.Enum("OK", "FAIL", "ERROR", "SKIPPED", "CONTENT") LINE_ENDINGS = { - "... ok": LineType.OK, - "... FAIL": LineType.FAIL, - "... ERROR": LineType.ERROR, - "... skipped": LineType.SKIPPED, + " ... ok": LineType.OK, + " ... FAIL": LineType.FAIL, + " ... ERROR": LineType.ERROR, + " ... skipped": LineType.SKIPPED, } LINE_ATTR = { @@ -49,7 +49,7 @@ def apply_filters(testing_output, *filters): line_type = LineType.CONTENT for ending in LINE_ENDINGS: - if line.endswith(ending): + if ending in line: line_type = LINE_ENDINGS[ending] break @@ -90,11 +90,24 @@ def align_results(line_type, line_content): # strip our current ending for ending in LINE_ENDINGS: if LINE_ENDINGS[ending] == line_type: - line_content = line_content.rstrip(ending).rstrip() + line_content = line_content.replace(ending, "", 1) break - new_ending = term.format(line_type.upper(), term.Attr.BOLD) - return "%-65s[%s]" % (line_content, new_ending) + # skipped tests have extra single quotes around the reason + if line_type == LineType.SKIPPED: + line_content = line_content.replace("'(", "(", 1).replace(")'", ")", 1) + + if line_type == LineType.OK: + new_ending = "SUCCESS" + elif line_type in (LineType.FAIL, LineType.ERROR): + new_ending = "FAILURE" + elif line_type == LineType.SKIPPED: + new_ending = "SKIPPED" + else: + assert False, "Unexpected line type: %s" % line_type + return line_content + + return "%-61s[%s]" % (line_content, term.format(new_ending, term.Attr.BOLD)) class ErrorTracker: """

1 0

[stem/master] Making test results right aligned and bold
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit 8795873a50c722419700dec1fff56d289799a1c0 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 28 10:24:58 2011 -0800 Making test results right aligned and bold Instead of showing test results as... test.foo ... ok test.hello_world ... ok I'm now showing them like... test.foo [OK] test.hello_world [OK] with the result text bolded. Thanks to Josh Barr for the idea. --- run_tests.py | 7 ++++++- stem/util/term.py | 5 +++++ test/output.py | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2b9e412..fbed159 100755 --- a/run_tests.py +++ b/run_tests.py @@ -176,7 +176,12 @@ if __name__ == '__main__': print error_tracker = test.output.ErrorTracker() - output_filters = (error_tracker.get_filter(), test.output.strip_module, test.output.colorize) + output_filters = ( + error_tracker.get_filter(), + test.output.strip_module, + test.output.align_results, + test.output.colorize, + ) if run_unit_tests: print_divider("UNIT TESTS", True) diff --git a/stem/util/term.py b/stem/util/term.py index ef8d1b6..dd1a34e 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -43,6 +43,11 @@ def format(msg, *attr): attributes and ending with a reset """ + # if we have reset sequences in the message then apply our attributes + # after each of them + if RESET in msg: + return "".join([format(comp, *attr) for comp in msg.split(RESET)]) + encodings = [] for text_attr in attr: text_attr, encoding = stem.util.enum.to_camel_case(text_attr), None diff --git a/test/output.py b/test/output.py index 9df9088..971aab9 100644 --- a/test/output.py +++ b/test/output.py @@ -79,6 +79,23 @@ def strip_module(line_type, line_content): if m: line_content = line_content.replace(m.groups()[0], "", 1) return line_content +def align_results(line_type, line_content): + """ + Strips the normal test results, and adds a right aligned variant instead with + a bold attribute. + """ + + if line_type == LineType.CONTENT: return line_content + + # strip our current ending + for ending in LINE_ENDINGS: + if LINE_ENDINGS[ending] == line_type: + line_content = line_content.rstrip(ending).rstrip() + break + + new_ending = term.format(line_type.upper(), term.Attr.BOLD) + return "%-65s[%s]" % (line_content, new_ending) + class ErrorTracker: """ Stores any failure or error results we've encountered.

1 0

[stem/master] Moving testing module from results to header
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit 285bffdab1c818ee675390701a0539510f41b4f7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 28 10:01:23 2011 -0800 Moving testing module from results to header Dropping the custom header titles and putting the module name there instead. This means that the module name is redundant with the test results, which was cluttering the output (bad for readability). Thanks to Josh Barr for the suggestion. --- run_tests.py | 45 +++++++++++++++++++++++---------------------- test/output.py | 12 ++++++++++++ 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/run_tests.py b/run_tests.py index 7e3dadb..2b9e412 100755 --- a/run_tests.py +++ b/run_tests.py @@ -35,23 +35,24 @@ OPT = "uic:t:h" OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "help"] DIVIDER = "=" * 70 -# (name, class) tuples for all of our unit and integration tests -UNIT_TESTS = (("stem.socket.ControlMessage", test.unit.socket.control_message.TestControlMessage), - ("stem.socket.ControlLine", test.unit.socket.control_line.TestControlLine), - ("stem.types.Version", test.unit.version.TestVersion), - ("stem.connection.authenticate", test.unit.connection.authentication.TestAuthenticate), - ("stem.connection.ProtocolInfoResponse", test.unit.connection.protocolinfo.TestProtocolInfoResponse), - ("stem.util.enum", test.unit.util.enum.TestEnum), - ("stem.util.system", test.unit.util.system.TestSystem), - ) +UNIT_TESTS = ( + test.unit.socket.control_message.TestControlMessage, + test.unit.socket.control_line.TestControlLine, + test.unit.version.TestVersion, + test.unit.connection.authentication.TestAuthenticate, + test.unit.connection.protocolinfo.TestProtocolInfoResponse, + test.unit.util.enum.TestEnum, + test.unit.util.system.TestSystem, +) -INTEG_TESTS = (("stem.socket.ControlMessage", test.integ.socket.control_message.TestControlMessage), - ("stem.connection.authenticate", test.integ.connection.authentication.TestAuthenticate), - ("stem.connection.connect_*", test.integ.connection.connect.TestConnect), - ("stem.connection.get_protocolinfo", test.integ.connection.protocolinfo.TestProtocolInfo), - ("stem.util.conf", test.integ.util.conf.TestConf), - ("stem.util.system", test.integ.util.system.TestSystem), - ) +INTEG_TESTS = ( + test.integ.socket.control_message.TestControlMessage, + test.integ.connection.authentication.TestAuthenticate, + test.integ.connection.connect.TestConnect, + test.integ.connection.protocolinfo.TestProtocolInfo, + test.integ.util.conf.TestConf, + test.integ.util.system.TestSystem, +) # Integration tests above the basic suite. TARGETS = stem.util.enum.Enum(*[(v, v) for v in ("ONLINE", "RELATIVE", "CONN_NONE", "CONN_OPEN", "CONN_PASSWORD", "CONN_COOKIE", "CONN_MULTIPLE", "CONN_SOCKET", "CONN_SCOOKIE", "CONN_ALL")]) @@ -175,13 +176,13 @@ if __name__ == '__main__': print error_tracker = test.output.ErrorTracker() - output_filters = (error_tracker.get_filter(), test.output.colorize, ) + output_filters = (error_tracker.get_filter(), test.output.strip_module, test.output.colorize) if run_unit_tests: print_divider("UNIT TESTS", True) - for name, test_class in UNIT_TESTS: - print_divider(name) + for test_class in UNIT_TESTS: + print_divider(test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() unittest.TextTestRunner(test_results, verbosity=2).run(suite) @@ -230,9 +231,9 @@ if __name__ == '__main__': print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) print - for name, test_class in INTEG_TESTS: - print_divider(name) - stem_logger.info("STARTING INTEGRATION TEST => %s" % name) + for test_class in INTEG_TESTS: + print_divider(test_class.__module__) + stem_logger.info("STARTING INTEGRATION TEST => %s" % test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() unittest.TextTestRunner(test_results, verbosity=2).run(suite) diff --git a/test/output.py b/test/output.py index 4b53e52..9df9088 100644 --- a/test/output.py +++ b/test/output.py @@ -3,6 +3,8 @@ Variety of filters for the python unit testing output, which can be chained together for improved readability. """ +import re + import stem.util.enum import stem.util.term as term @@ -67,6 +69,16 @@ def colorize(line_type, line_content): return term.format(line_content, *LINE_ATTR[line_type]) +def strip_module(line_type, line_content): + """ + Removes the module name from testing output. This information tends to be + repetative, and redundant with the headers. + """ + + m = re.match(".*( \(.*?\)).*", line_content) + if m: line_content = line_content.replace(m.groups()[0], "", 1) + return line_content + class ErrorTracker: """ Stores any failure or error results we've encountered.

1 0

[stem/master] Testing argument to include logging output
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit 08f3061dc7c03a735a27024ad417fb2e4026a7c5 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 30 09:49:28 2011 -0800 Testing argument to include logging output Adding a '-l' or '--log' argument that includes DEBUG level logging output with the test results. Hopefully by making the log output more visible it'll become more helpful. --- run_tests.py | 24 +++++++++++++++++++++--- test/output.py | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index fbed159..9ceb2b1 100755 --- a/run_tests.py +++ b/run_tests.py @@ -31,8 +31,8 @@ import test.integ.connection.protocolinfo import stem.util.enum import stem.util.term as term -OPT = "uic:t:h" -OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "help"] +OPT = "uic:t:lh" +OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log", "help"] DIVIDER = "=" * 70 UNIT_TESTS = ( @@ -77,6 +77,7 @@ Runs tests for the stem library. -i, --integ runs integration tests -c, --config PATH path to a custom test configuration -t, --target TARGET comma separated list of extra targets for integ tests + -l, --log includes logging output with test results -h, --help presents this help Integration targets: @@ -100,12 +101,19 @@ def print_divider(msg, is_header = False): attr = HEADER_ATTR if is_header else CATEGORY_ATTR print term.format("%s\n%s\n%s\n" % (DIVIDER, msg.center(70), DIVIDER), *attr) +def print_logging(logging_buffer): + for line in logging_buffer: + print term.format(line, term.Color.MAGENTA) + + print + if __name__ == '__main__': start_time = time.time() run_unit_tests = False run_integ_tests = False config_path = None test_config = stem.util.conf.get_config("test") + include_logging = False # parses user input, noting any issues try: @@ -134,6 +142,8 @@ if __name__ == '__main__': # sets the configuration flag config_flag = TARGET_ATTR[target][0] test_config.set(config_flag, "true") + elif opt in ("-l", "--log"): + include_logging = True elif opt in ("-h", "--help"): # Prints usage information and quits. This includes a listing of the # valid integration targets. @@ -183,6 +193,11 @@ if __name__ == '__main__': test.output.colorize, ) + stem_logger = logging.getLogger("stem") + logging_buffer = test.output.LogBuffer() + stem_logger.addHandler(logging_buffer) + stem_logger.setLevel(logging.DEBUG) + if run_unit_tests: print_divider("UNIT TESTS", True) @@ -194,13 +209,14 @@ if __name__ == '__main__': sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print + + if include_logging: print_logging(logging_buffer) print if run_integ_tests: print_divider("INTEGRATION TESTS", True) integ_runner = test.runner.get_runner() - stem_logger = logging.getLogger("stem") # queue up all of the tor configurations we want to run the integration # tests on @@ -245,6 +261,8 @@ if __name__ == '__main__': sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print + + if include_logging: print_logging(logging_buffer) except OSError: pass finally: diff --git a/test/output.py b/test/output.py index d5e7a6d..b7a1991 100644 --- a/test/output.py +++ b/test/output.py @@ -4,6 +4,7 @@ together for improved readability. """ import re +import logging import stem.util.enum import stem.util.term as term @@ -133,3 +134,24 @@ class ErrorTracker: for error_line in self._errors: yield error_line +class LogBuffer(logging.Handler): + """ + Basic log handler that listens for all stem events and stores them so they + can be read later. Log entries are cleared as they are read. + """ + + def __init__(self): + logging.Handler.__init__(self, level = logging.DEBUG) + self.formatter = logging.Formatter( + fmt = '%(asctime)s [%(levelname)s] %(message)s', + datefmt = '%D %H:%M:%S') + + self._buffer = [] + + def __iter__(self): + while self._buffer: + yield self.formatter.format(self._buffer.pop(0)) + + def emit(self, record): + self._buffer.append(record) +

1 0

[stem/master] Only issuing WARN for get_bsd_jail_id on FreeBSD
by atagar＠torproject.org 30 Dec '11

30 Dec '11

commit b56b9c627332208913b91357c02267c472644fe9 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 30 10:12:57 2011 -0800 Only issuing WARN for get_bsd_jail_id on FreeBSD The stem.util.system.get_bsd_jail_id() function is only available on FreeBSD (and maybe OSX) so only issuing a warning for failures on that platform. Everywhere else this now gives a DEBUG level message to warn the developer that the function's unsupported. --- stem/util/system.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 8d4708e..bb50093 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -484,7 +484,15 @@ def get_bsd_jail_id(pid): jid = ps_output[1].strip() if jid.isdigit(): return int(jid) - LOGGER.warn("Failed to figure out the FreeBSD jail id. Assuming 0.") + # TODO: Is this function exclusive to FreeBSD or does it work on other BSD + # systems? It should fail on OpenBSD but might work on OSX. + + os_name = os.uname()[0] + if os_name == "FreeBSD": + LOGGER.warn("Failed to figure out the FreeBSD jail id for pid %s. Guessing that it's not in a jail." % pid) + else: + LOGGER.debug("get_bsd_jail_id(%s): this function isn't supported on %s" % (pid, os_name)) + return 0 def is_relative_path(path):

1 0