April 2013 - tor-commits - lists.torproject.org

[stem/master] Dropping load_user_configuration() helper
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit a8d1eb06768335ac2d95af78195608ba0f091f7b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 11 08:58:05 2013 -0700 Dropping load_user_configuration() helper One step closer to simplifying our arg parsing. The load_user_configuration() was mostly there to unify our configuration and commandline arguments. Now that the new-world-order will only have the later we should drop the helper to simplify the code. --- run_tests.py | 152 ++++++++++++++++++++++++++-------------------------------- 1 files changed, 68 insertions(+), 84 deletions(-) diff --git a/run_tests.py b/run_tests.py index 92c40ab..45c3e00 100755 --- a/run_tests.py +++ b/run_tests.py @@ -66,89 +66,6 @@ DEFAULT_RUN_TARGET = Target.RUN_OPEN ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) -def load_user_configuration(test_config): - """ - Parses our commandline arguments, loading our custom test configuration if - '--config' was provided and then appending arguments to that. This does some - sanity checking on the input, printing an error and quitting if validation - fails. - """ - - arg_overrides = {} - - try: - opts = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED)[0] - except getopt.GetoptError, exc: - print "%s (for usage provide --help)" % exc - sys.exit(1) - - for opt, arg in opts: - if opt in ("-a", "--all"): - arg_overrides["argument.unit"] = "true" - arg_overrides["argument.integ"] = "true" - arg_overrides["argument.style"] = "true" - elif opt in ("-u", "--unit"): - arg_overrides["argument.unit"] = "true" - elif opt in ("-i", "--integ"): - arg_overrides["argument.integ"] = "true" - elif opt in ("-s", "--style"): - arg_overrides["argument.style"] = "true" - elif opt == "--python3": - arg_overrides["argument.python3"] = "true" - elif opt == "--clean": - arg_overrides["argument.python3_clean"] = "true" - elif opt in ("-t", "--targets"): - integ_targets = arg.split(",") - - # validates the targets - if not integ_targets: - print "No targets provided" - sys.exit(1) - - for target in integ_targets: - if not target in Target: - print "Invalid integration target: %s" % target - sys.exit(1) - else: - target_config = test_config.get("target.config", {}).get(target) - - if target_config: - arg_overrides[target_config] = "true" - elif opt in ("-l", "--test"): - arg_overrides["argument.test"] = arg - elif opt in ("-l", "--log"): - arg_overrides["argument.log"] = arg.upper() - elif opt in ("--tor"): - arg_overrides["argument.tor"] = arg - elif opt in ("-h", "--help"): - # Prints usage information and quits. This includes a listing of the - # valid integration targets. - - print CONFIG["msg.help"] - - # gets the longest target length so we can show the entries in columns - target_name_length = max(map(len, Target)) - description_format = " %%-%is - %%s" % target_name_length - - for target in Target: - print description_format % (target, CONFIG["target.description"].get(target, "")) - - print - - sys.exit() - - for key, value in arg_overrides.items(): - test_config.set(key, value) - - # basic validation on user input - - log_config = CONFIG["argument.log"] - if log_config and not log_config in log.LOG_VALUES: - print "'%s' isn't a logging runlevel, use one of the following instead:" % log_config - print " TRACE, DEBUG, INFO, NOTICE, WARN, ERROR" - sys.exit(1) - - def _clean_orphaned_pyc(): test.output.print_noline(" checking for orphaned .pyc files... ", *test.runner.STATUS_ATTR) @@ -289,7 +206,74 @@ if __name__ == '__main__': settings_path = os.path.join(test.runner.STEM_BASE, "test", "settings.cfg") test_config.load(settings_path) - load_user_configuration(test_config) + try: + opts = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED)[0] + except getopt.GetoptError, exc: + print "%s (for usage provide --help)" % exc + sys.exit(1) + + for opt, arg in opts: + if opt in ("-a", "--all"): + test_config.set("argument.unit", "true") + test_config.set("argument.integ", "true") + test_config.set("argument.style", "true") + elif opt in ("-u", "--unit"): + test_config.set("argument.unit", "true") + elif opt in ("-i", "--integ"): + test_config.set("argument.integ", "true") + elif opt in ("-s", "--style"): + test_config.set("argument.style", "true") + elif opt == "--python3": + test_config.set("argument.python3", "true") + elif opt == "--clean": + test_config.set("argument.python3_clean", "true") + elif opt in ("-t", "--targets"): + integ_targets = arg.split(",") + + # validates the targets + if not integ_targets: + print "No targets provided" + sys.exit(1) + + for target in integ_targets: + if not target in Target: + print "Invalid integration target: %s" % target + sys.exit(1) + else: + target_config = test_config.get("target.config", {}).get(target) + + if target_config: + test_config.set(target_config, "true") + elif opt in ("-l", "--test"): + test_config.set("argument.test", arg) + elif opt in ("-l", "--log"): + test_config.set("argument.log", arg.upper()) + elif opt in ("--tor"): + test_config.set("argument.tor", arg) + elif opt in ("-h", "--help"): + # Prints usage information and quits. This includes a listing of the + # valid integration targets. + + print CONFIG["msg.help"] + + # gets the longest target length so we can show the entries in columns + target_name_length = max(map(len, Target)) + description_format = " %%-%is - %%s" % target_name_length + + for target in Target: + print description_format % (target, CONFIG["target.description"].get(target, "")) + + print + + sys.exit() + + # basic validation on user input + + log_config = CONFIG["argument.log"] + if log_config and not log_config in log.LOG_VALUES: + print "'%s' isn't a logging runlevel, use one of the following instead:" % log_config + print " TRACE, DEBUG, INFO, NOTICE, WARN, ERROR" + sys.exit(1) # check that we have 2to3 and python3 available in our PATH if CONFIG["argument.python3"]:

1 0

[stem/master] Moving test filter to helper function
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit 347d2859073672e9c0354727901769245fb3b758 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 11 08:35:31 2013 -0700 Moving test filter to helper function Shifting support for the '--test' argument to the helper. Oh, and the integ helper was running the unit tests instead. ;) --- run_tests.py | 12 ++---------- test/runner.py | 30 ++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/run_tests.py b/run_tests.py index 096de69..3de1fbf 100755 --- a/run_tests.py +++ b/run_tests.py @@ -358,11 +358,7 @@ if __name__ == '__main__': test.output.print_divider("UNIT TESTS", True) error_tracker.set_category("UNIT TEST") - for test_class in test.runner.get_unit_tests(): - if CONFIG["argument.test"] and \ - not test_class.__module__.startswith(CONFIG["argument.test"]): - continue - + for test_class in test.runner.get_unit_tests(CONFIG["argument.test"]): test.output.print_divider(test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() @@ -442,11 +438,7 @@ if __name__ == '__main__': test.output.print_line("Running tests...", term.Color.BLUE, term.Attr.BOLD) print - for test_class in test.runner.get_integ_tests(): - if CONFIG["argument.test"] and \ - not test_class.__module__.startswith(CONFIG["argument.test"]): - continue - + for test_class in test.runner.get_integ_tests(CONFIG["argument.test"]): test.output.print_divider(test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() diff --git a/test/runner.py b/test/runner.py index 592d367..9e809fe 100644 --- a/test/runner.py +++ b/test/runner.py @@ -217,28 +217,42 @@ def exercise_controller(test_case, controller): -def get_unit_tests(): +def get_unit_tests(prefix = None): """ Provides the classes for our unit tests. + :param str prefix: only provide the test if the module starts with this prefix + :returns: an **iterator** for our unit tests """ - for test_module in CONFIG["test.unit_tests"].splitlines(): - if test_module: - yield _import_test(test_module) + for line in CONFIG["test.unit_tests"].splitlines(): + if line: + test_class = _import_test(line) + + if prefix and not test_class.__module__.startswith(prefix): + continue + + yield test_class -def get_integ_tests(): +def get_integ_tests(prefix = None): """ Provides the classes for our integration tests. + :param str prefix: only provide the test if the module starts with this prefix + :returns: an **iterator** for our integration tests """ - for test_module in CONFIG["test.unit_tests"].splitlines(): - if test_module: - yield _import_test(test_module) + for line in CONFIG["test.integ_tests"].splitlines(): + if line: + test_class = _import_test(line) + + if prefix and not test_class.__module__.startswith(prefix): + continue + + yield test_class def _import_test(import_name):

1 0

[stem/master] Moving test imports to the runner module
by atagar＠torproject.org 14 Apr '13

14 Apr '13

commit 76e751f9c8fd338c73752a8547cedc92a95363de Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 10 10:16:35 2013 -0700 Moving test imports to the runner module Ideally the run_tests.py module should be as simple as possible, simply parsing the user input and calling helper functions to run the tests. To this end I'm moving the code for enumerating unit and integration tests into the runner module. --- run_tests.py | 33 ++------------------------------- test/runner.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/run_tests.py b/run_tests.py index 17de0ee..096de69 100755 --- a/run_tests.py +++ b/run_tests.py @@ -45,8 +45,6 @@ CONFIG = stem.util.conf.config_dict("test", { "target.prereq": {}, "target.torrc": {}, "integ.test_directory": "./test/data", - "test.unit_tests": "", - "test.integ_tests": "", }) Target = stem.util.enum.UppercaseEnum( @@ -284,23 +282,6 @@ def _print_style_issues(): print -def _import_test(import_name): - # Dynamically imports test modules. The __import__() call has a couple quirks - # that make this a little clunky... - # - # * it only accepts modules, not the actual class we want to import - # - # * it returns the top level module, so we need to transverse into it for - # the test class - - module_name = '.'.join(import_name.split('.')[:-1]) - module = __import__(module_name) - - for subcomponent in import_name.split(".")[1:]: - module = getattr(module, subcomponent) - - return module - if __name__ == '__main__': try: stem.prereq.check_requirements() @@ -377,12 +358,7 @@ if __name__ == '__main__': test.output.print_divider("UNIT TESTS", True) error_tracker.set_category("UNIT TEST") - for test_module in CONFIG["test.unit_tests"].splitlines(): - if not test_module: - continue - - test_class = _import_test(test_module) - + for test_class in test.runner.get_unit_tests(): if CONFIG["argument.test"] and \ not test_class.__module__.startswith(CONFIG["argument.test"]): continue @@ -466,12 +442,7 @@ if __name__ == '__main__': test.output.print_line("Running tests...", term.Color.BLUE, term.Attr.BOLD) print - for test_module in CONFIG["test.integ_tests"].splitlines(): - if not test_module: - continue - - test_class = _import_test(test_module) - + for test_class in test.runner.get_integ_tests(): if CONFIG["argument.test"] and \ not test_class.__module__.startswith(CONFIG["argument.test"]): continue diff --git a/test/runner.py b/test/runner.py index 5010224..592d367 100644 --- a/test/runner.py +++ b/test/runner.py @@ -18,6 +18,9 @@ about the tor test instance they're running against. require_online - skips unless targets allow for online tests exercise_controller - basic sanity check that a controller connection can be used + get_unit_tests - provides our unit tests + get_integ_tests - provides our integration tests + get_runner - Singleton for fetching our runtime context. Runner - Runtime context for our integration tests. |- start - prepares and starts a tor instance for our tests to run against @@ -65,6 +68,8 @@ CONFIG = stem.util.conf.config_dict("test", { "integ.target.online": False, "integ.target.relative_data_dir": False, "integ.target.chroot": False, + "test.unit_tests": "", + "test.integ_tests": "", }) STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) @@ -211,6 +216,49 @@ def exercise_controller(test_case, controller): test_case.assertEquals("config-file=%s\nOK" % torrc_path, str(config_file_response)) + +def get_unit_tests(): + """ + Provides the classes for our unit tests. + + :returns: an **iterator** for our unit tests + """ + + for test_module in CONFIG["test.unit_tests"].splitlines(): + if test_module: + yield _import_test(test_module) + + +def get_integ_tests(): + """ + Provides the classes for our integration tests. + + :returns: an **iterator** for our integration tests + """ + + for test_module in CONFIG["test.unit_tests"].splitlines(): + if test_module: + yield _import_test(test_module) + + +def _import_test(import_name): + # Dynamically imports test modules. The __import__() call has a couple quirks + # that make this a little clunky... + # + # * it only accepts modules, not the actual class we want to import + # + # * it returns the top level module, so we need to transverse into it for + # the test class + + module_name = '.'.join(import_name.split('.')[:-1]) + module = __import__(module_name) + + for subcomponent in import_name.split(".")[1:]: + module = getattr(module, subcomponent) + + return module + + def get_runner(): """ Singleton for the runtime context of integration tests.

1 0

[torbirdy/master] Change the color of Transparent Torification label
by sukhbir＠torproject.org 13 Apr '13

13 Apr '13

commit 6f9681c0f4b5d5a9c54d0e0e232816b46eaffdb1 Author: Sukhbir Singh <sukhbir.in(a)gmail.com> Date: Sat Apr 13 19:49:10 2013 -0400 Change the color of Transparent Torification label --- chrome/content/preferences.xul | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index 12979b5..9218cd8 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -77,7 +77,7 @@ </rows> </grid> - <radio accesskey="&torbirdy.prefs.torification.key;" id="torbirdy-torification" label="&torbirdy.prefs.torification.label;" /> + <radio accesskey="&torbirdy.prefs.torification.key;" id="torbirdy-torification" label="&torbirdy.prefs.torification.label;" style="color:red"/> </radiogroup>

1 0

[tor-cloud/master] more word formatting
by runa＠torproject.org 13 Apr '13

13 Apr '13

commit b350d61fd49f6a1aabb1de8815a8280fb4b1b021 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Apr 13 19:14:07 2013 -0400 more word formatting --- html/index.html | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/html/index.html b/html/index.html index a8351b4..1c2053e 100644 --- a/html/index.html +++ b/html/index.html @@ -372,8 +372,7 @@ 12. Where do I report a bug I am encountering? If you think the bug you have found is specific to the Tor Cloud - images we provide, please <a - href="https://trac.torproject.org">file a bug</a> or + images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to help AT rt.torproject.org. 13. Is there an IRC channel where I can ask about Tor Cloud?

1 0

[tor-cloud/master] remove old file
by runa＠torproject.org 13 Apr '13

13 Apr '13

commit 604cc99bf54e3e168787371ca745223277b65113 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Apr 13 18:14:53 2013 -0400 remove old file --- html/torrc.txt | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/html/torrc.txt b/html/torrc.txt deleted file mode 100644 index 46902ef..0000000 --- a/html/torrc.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Auto generated public Tor $CONFIG config file - -# A unique handle for your server. -Nickname ec2$CONFIG$RESERVATION - -# Set "SocksPort 0" if you plan to run Tor only as a server, and not make any -# local application connections yourself. -SocksPort 0 - -# What port to advertise for Tor connections. -ORPort 443 - -# Listen on a port other than the one advertised in ORPort (that is, advertise -# 443 but bind to 9001). -ORListenAddress 0.0.0.0:9001 - -# Start Tor as a bridge. -BridgeRelay 1 - -# Never send or receive more than 10GB of data per week. The accounting period -# runs from 10 AM on the 1st day of the week (Monday) to the same day and time -# of the next week. -AccountingStart week 1 10:00 -AccountingMax 10 GB - -# Running a bridge relay just passes data to and from the Tor network -- so it -# shouldn't expose the operator to abuse complaints. -Exitpolicy reject *:*

1 0

[tor-cloud/master] change word wrapping
by runa＠torproject.org 13 Apr '13

13 Apr '13

commit 900027ab489230e7458b64d61061d01fca08fccf Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Apr 13 18:43:25 2013 -0400 change word wrapping --- html/index.html | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/html/index.html b/html/index.html index 37fc06e..a8351b4 100644 --- a/html/index.html +++ b/html/index.html @@ -295,9 +295,8 @@ 1. How much does it cost? - There is no fee charged by the Tor Project, Inc for you to run a - Tor Cloud image. Amazon does, however, charge instances - according to their <a + There is no fee charged by the Tor Project, Inc for you to run a + Tor Cloud image. Amazon does, however, charge instances according to their <a href="http://aws.amazon.com/ec2/pricing/">pricing</a>. See How much does it cost? on the <a href="https://cloud.torproject.org/">front page</a> for more

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 13 Apr '13

13 Apr '13

commit 95ccb1e812ef1a1c38bd3275b2bbf6b95e0c490d Merge: 9a4e9b4 8aded5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 13 18:29:25 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/fix-geoipexclude-doc | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
by nickm＠torproject.org 13 Apr '13

13 Apr '13

commit 8aded5b07c14824b6fcbd7583af9ed4f4d8466d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 13 18:27:08 2013 -0400 Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes Spotted on tor-talk by "hamahangi". --- changes/fix-geoipexclude-doc | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/fix-geoipexclude-doc b/changes/fix-geoipexclude-doc new file mode 100644 index 0000000..63b544e --- /dev/null +++ b/changes/fix-geoipexclude-doc @@ -0,0 +1,4 @@ + o Documentation fixes: + - Fix the GeoIPExcludeUnknown documentation to refer to ExcludeExitNodes + rather than the currently nonexistent ExcludeEntryNodes. Spotted by + "hamahangi" on tor-talk. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f35d639..adcf6b7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -695,10 +695,10 @@ The following options are useful only for clients (that is, if **GeoIPExcludeUnknown** **0**|**1**|**auto**:: If this option is set to 'auto', then whenever any country code is set in - ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (\{??} and + ExcludeNodes or ExcludeExitNodes, all nodes with unknown country (\{??} and possibly \{A1}) are treated as excluded as well. If this option is set to '1', then all unknown countries are treated as excluded in ExcludeNodes - and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't + and ExcludeExitNodes. This option has no effect when a GeoIP file isn't configured or can't be found. (Default: auto) **ExitNodes** __node__,__node__,__...__::

1 0

[tor/maint-0.2.4] Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes
by nickm＠torproject.org 13 Apr '13

13 Apr '13

commit 8aded5b07c14824b6fcbd7583af9ed4f4d8466d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 13 18:27:08 2013 -0400 Manpage: refer to ExcludeExitNodes, not the nonexistent ExcludeEntryNodes Spotted on tor-talk by "hamahangi". --- changes/fix-geoipexclude-doc | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/fix-geoipexclude-doc b/changes/fix-geoipexclude-doc new file mode 100644 index 0000000..63b544e --- /dev/null +++ b/changes/fix-geoipexclude-doc @@ -0,0 +1,4 @@ + o Documentation fixes: + - Fix the GeoIPExcludeUnknown documentation to refer to ExcludeExitNodes + rather than the currently nonexistent ExcludeEntryNodes. Spotted by + "hamahangi" on tor-talk. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f35d639..adcf6b7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -695,10 +695,10 @@ The following options are useful only for clients (that is, if **GeoIPExcludeUnknown** **0**|**1**|**auto**:: If this option is set to 'auto', then whenever any country code is set in - ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (\{??} and + ExcludeNodes or ExcludeExitNodes, all nodes with unknown country (\{??} and possibly \{A1}) are treated as excluded as well. If this option is set to '1', then all unknown countries are treated as excluded in ExcludeNodes - and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't + and ExcludeExitNodes. This option has no effect when a GeoIP file isn't configured or can't be found. (Default: auto) **ExitNodes** __node__,__node__,__...__::

1 0