tor-commits January 2014

tor-commits@lists.torproject.org

23 participants
2271 discussions

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 05 Jan '14

05 Jan '14

commit e1dc2c904a528461ccd0fc5c62923e29e8c2805f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 14:45:12 2014 +0000 Update translations for vidalia --- fr_CA/vidalia_fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/vidalia_fr_CA.po b/fr_CA/vidalia_fr_CA.po index 7812551..21f1d49 100644 --- a/fr_CA/vidalia_fr_CA.po +++ b/fr_CA/vidalia_fr_CA.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" … [View More]

1 0

r26523: {website} add new mirror in Germany. (website/trunk/include)
by Andrew Lewman 05 Jan '14

05 Jan '14

Author: phobos Date: 2014-01-05 13:52:34 +0000 (Sun, 05 Jan 2014) New Revision: 26523 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror in Germany. Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-01-05 01:57:37 UTC (rev 26522) +++ website/trunk/include/tor-mirrors.csv 2014-01-05 13:52:34 UTC (rev 26523) @@ -73,3 +73,4 @@ postmaster(a)otivpn.com, otivpn.com, … [View More]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 05 Jan '14

05 Jan '14

commit 783f2adbbdc80908bf953c0d4166526f5884682f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 06:45:08 2014 +0000 Update translations for tsum --- uk/short-user-manual_uk_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/short-user-manual_uk_noimg.xhtml b/uk/short-user-manual_uk_noimg.xhtml index 2e03054..f41be3f 100644 --- a/uk/short-user-manual_uk_noimg.xhtml +++ b/uk/short-user-manual_uk_noimg.xhtml @@ -12,7 +… [View More]

1 0

r26522: {website} patch from ticket 10556 for press page. (website/trunk/press/en)
by Andrew Lewman 05 Jan '14

05 Jan '14

Author: phobos Date: 2014-01-05 01:57:37 +0000 (Sun, 05 Jan 2014) New Revision: 26522 Modified: website/trunk/press/en/press.wml Log: patch from ticket 10556 for press page. Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2014-01-04 17:10:55 UTC (rev 26521) +++ website/trunk/press/en/press.wml 2014-01-05 01:57:37 UTC (rev 26522) @@ -25,14 +25,250 @@ <table width="100%" cellpadding="3" … [View More]

1 0

[stem/master] Defaulting to provide less verbose test output
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 6f696e98c155434d6ac95806052eb634d36e1e8e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 15:14:31 2014 -0800 Defaulting to provide less verbose test output Our test output is pretty sweet, but as we've added more tests it's gotten to be pretty overwhelming. This is especially troublesome for the RUN_ALL target which our jenkins test use. Dropping output on individual tests unless there's a failure. Instead, we now just print the … [View More]test modules and their runtime. Users can get the more verbose output by including '--verbose' in their test run. --- run_tests.py | 44 +++++++++++++++++++++++++++++++++++--------- test/settings.cfg | 1 + 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9559311..664df35 100755 --- a/run_tests.py +++ b/run_tests.py @@ -25,7 +25,7 @@ import test.output import test.runner import test.util -from test.output import STATUS, SUCCESS, ERROR, println +from test.output import STATUS, SUCCESS, ERROR, NO_NL, println from test.util import STEM_BASE, Target, Task # Our default arguments. The _get_args() function provides a named tuple of @@ -50,11 +50,12 @@ ARGS = { 'tor_path': 'tor', 'run_targets': [Target.RUN_OPEN], 'attribute_targets': [], + 'verbose': False, 'print_help': False, } -OPT = "auit:l:h" -OPT_EXPANDED = ["all", "unit", "integ", "python3", "clean", "targets=", "test=", "log=", "tor=", "help"] +OPT = "auit:l:vh" +OPT_EXPANDED = ["all", "unit", "integ", "python3", "clean", "targets=", "test=", "log=", "tor=", "verbose", "help"] CONFIG = stem.util.conf.config_dict("test", { "target.torrc": {}, @@ -212,7 +213,7 @@ def main(): error_tracker.set_category("UNIT TEST") for test_class in test.util.get_unit_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) println() @@ -248,7 +249,7 @@ def main(): owner = integ_runner.get_tor_controller(True) # controller to own our main Tor process for test_class in test.util.get_integ_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) if owner: @@ -384,6 +385,8 @@ def _get_args(argv): args['logging_runlevel'] = arg elif opt in ("--tor"): args['tor_path'] = arg + elif opt in ("-v", "--verbose"): + args['verbose'] = True elif opt in ("-h", "--help"): args['print_help'] = True @@ -416,15 +419,38 @@ def _print_static_issues(static_check_issues): println() -def _run_test(test_class, output_filters, logging_buffer): - test.output.print_divider(test_class.__module__) +def _run_test(args, test_class, output_filters, logging_buffer): + start_time = time.time() + + if args.verbose: + test.output.print_divider(test_class.__module__) + else: + label = test_class.__module__ + + if label.startswith('test.unit.'): + label = label[10:] + elif label.startswith('test.integ.'): + label = label[11:] + + label = " %s..." % label + label = "%-54s" % label + + println(label, STATUS, NO_NL) + suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) - sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) - println() + if args.verbose: + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) + println() + elif not run_result.failures: + println(" success (%0.2fs)" % (time.time() - start_time), SUCCESS) + else: + println(" failed (%0.2fs)" % (time.time() - start_time), ERROR) + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) + test.output.print_logging(logging_buffer) return run_result diff --git a/test/settings.cfg b/test/settings.cfg index 6fd436a..e78ddb4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -41,6 +41,7 @@ msg.help | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against +| -v, --verbose provides additional test output | -h, --help presents this help | | Examples: [View Less]

1 0

[stem/master] Moving static checks to the start
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit eaa7a9253ba8d8955a6d4ee911269bf94ed4f2aa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 12:14:17 2014 -0800 Moving static checks to the start Rearranging our test run so the static checks (pyflakes and pep8) occure at the start and are listed among the initialization tasks. This makes it clearer that they're running and the runtime dedicated to them. It also gets rid of a silent pause at the end of the test run I've always disliked. --- … [View More] run_tests.py | 60 ++++++++++++++++++++++++++++++++++++----------------- test/settings.cfg | 1 - test/util.py | 22 +++++++++++++------- 3 files changed, 56 insertions(+), 27 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0d0e6d0..b0b3171 100755 --- a/run_tests.py +++ b/run_tests.py @@ -87,6 +87,22 @@ version 0.8.0 or later... https://pypi.python.org/pypi/mock/ """ +PYFLAKES_TASK = Task( + "running pyflakes", + test.util.get_pyflakes_issues, + args = (SRC_PATHS,), + is_required = False, + print_result = False, +) + +PEP8_TASK = Task( + "running pep8", + test.util.get_stylistic_issues, + args = (SRC_PATHS,), + is_required = False, + print_result = False, +) + def main(): start_time = time.time() @@ -134,6 +150,15 @@ def main(): sys.exit(1) + pyflakes_task, pep8_task = None, None + + if not stem.prereq.is_python_3(): + if test.util.is_pyflakes_available(): + pyflakes_task = PYFLAKES_TASK + + if test.util.is_pep8_available(): + pep8_task = PEP8_TASK + test.util.run_tasks( "INITIALISING", Task("checking stem version", test.util.check_stem_version), @@ -144,6 +169,8 @@ def main(): Task("checking pep8 version", test.util.check_pep8_version), Task("checking for orphaned .pyc files", test.util.clean_orphaned_pyc, (SRC_PATHS,)), Task("checking for unused tests", test.util.check_for_unused_tests, ((os.path.join(STEM_BASE, 'test'),),)), + pyflakes_task, + pep8_task, ) if args.run_python3 and sys.version_info[0] != 3: @@ -262,7 +289,19 @@ def main(): println() if not stem.prereq.is_python_3(): - _print_static_issues(args) + static_check_issues = {} + + if pyflakes_task and pyflakes_task.is_successful: + static_check_issues.update(pyflakes_task.result) + elif not test.util.is_pyflakes_available(): + println("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) + + if pep8_task and pep8_task.is_successful: + static_check_issues.update(pep8_task.result) + elif not test.util.is_pep8_available(): + println("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) + + _print_static_issues(static_check_issues) runtime_label = "(%i seconds)" % (time.time() - start_time) @@ -354,24 +393,7 @@ def _get_args(argv): return Args(**args) -def _print_static_issues(args): - static_check_issues = {} - - # If we're doing some sort of testing (unit or integ) and pyflakes is - # available then use it. Its static checks are pretty quick so there's not - # much overhead in including it with all tests. - - if args.run_unit or args.run_integ: - if test.util.is_pyflakes_available(): - static_check_issues.update(test.util.get_pyflakes_issues(SRC_PATHS)) - else: - println("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) - - if test.util.is_pep8_available(): - static_check_issues.update(test.util.get_stylistic_issues(SRC_PATHS)) - else: - println("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) - +def _print_static_issues(static_check_issues): if static_check_issues: println("STATIC CHECKS", STATUS) diff --git a/test/settings.cfg b/test/settings.cfg index 0515476..6fd436a 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -35,7 +35,6 @@ msg.help | -a, --all runs unit, integ, and style checks (same as '-uis') | -u, --unit runs unit tests | -i, --integ runs integration tests -| -s, --style runs style checker | -t, --target TARGET comma separated list of extra targets for integ tests | --test TEST_NAME only run tests modules matching the given name prefix | --python3 runs tests against a 2to3 conversion of the codebase diff --git a/test/util.py b/test/util.py index a889b92..d510d6f 100644 --- a/test/util.py +++ b/test/util.py @@ -554,6 +554,9 @@ def run_tasks(category, *tasks): test.output.print_divider(category, True) for task in tasks: + if task is None: + continue + task.run() if task.is_required and task.error: @@ -576,15 +579,19 @@ class Task(object): message or list of strings for its results. """ - def __init__(self, label, runner, args = None, is_required = True): + def __init__(self, label, runner, args = None, is_required = True, print_result = True): super(Task, self).__init__() self.label = label self.runner = runner self.args = args self.is_required = is_required + self.print_result = print_result self.error = None + self.is_successful = False + self.result = None + def run(self): println(" %s..." % self.label, STATUS, NO_NL) @@ -593,19 +600,20 @@ class Task(object): try: if self.args: - result = self.runner(*self.args) + self.result = self.runner(*self.args) else: - result = self.runner() + self.result = self.runner() + self.is_successful = True output_msg = "done" - if isinstance(result, str): - output_msg = result + if self.print_result and isinstance(self.result, str): + output_msg = self.result println(output_msg, STATUS) - if isinstance(result, (list, tuple)): - for line in result: + if self.print_result and isinstance(self.result, (list, tuple)): + for line in self.result: println(" %s" % line, STATUS) except Exception as exc: output_msg = str(exc) [View Less]

1 0

[stem/master] Checking for pep8.BaseReport
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 68979148f1e09b7bca22bde876524029f419d1e5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 12:21:42 2014 -0800 Checking for pep8.BaseReport Our jenkins tests are also failing because they have the pep8 module, but it lacks the BaseReport. Checking for that as well. --- run_tests.py | 4 ++-- test/util.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index b0b3171..9559311 100755 --- a/… [View More]

1 0

[stem/master] Checking for the pyflakes modules we use
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 32aadbc7f7918d5c9f47a748a288fad16ce5ca69 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 11:44:51 2014 -0800 Checking for the pyflakes modules we use Presently our jenkins tests are failing since the system has pyflakes version 0.5 which evidently doesn't have the pyflakes.api module... https://trac.torproject.org/10539 Checking explicitly for the modules we use when determining if pyflakes is avaialable. --- test/util.… [View More]

1 0

r26521: {website} Update obfsproxy instructions now that 0.2.4.x is not experi (website/trunk/projects/en)
by George Kadianakis 04 Jan '14

04 Jan '14

Author: asn Date: 2014-01-04 17:10:55 +0000 (Sat, 04 Jan 2014) New Revision: 26521 Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml website/trunk/projects/en/obfsproxy-instructions.wml Log: Update obfsproxy instructions now that 0.2.4.x is not experimental anymore. Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-debian-instructions.wml … [View More]

1 0

[ooni-probe/master] Include the GeoIP data files as part of the source distribution
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 6c3accabfe4c7f465afc02593d46bab4b29026a2 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 3 16:05:19 2014 +0100 Include the GeoIP data files as part of the source distribution * Install the geoip data files to /usr/share/geoip --- MANIFEST.in | 7 ++-- data/ooniprobe.conf.sample | 4 +-- requirements.txt | 4 +-- setup.py | 77 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), … [View More]16 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index adcc182..92586f8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include README.md ChangeLog.md requirements.txt -recursive-include data/ui/app * recursive-include data/decks * -recursive-include data/inputs * -include data/Makefile +include data/inputs/ +include data/GeoIP.dat +include data/GeoIPASNum.dat +include data/GeoLiteCity.dat include data/ooniprobe.conf.sample diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 83c1ebc..8a4e0f7 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -21,7 +21,7 @@ reports: pcap: null collector: 'httpo://nkvphnp3p6agi5qq.onion' advanced: - geoip_data_dir: /usr/share/ooni/ + geoip_data_dir: /usr/share/geoip debug: false # enable if auto detection fails #tor_binary: /usr/sbin/tor @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 15 # Specify here a custom data_dir path - data_dir: /usr/share/ooni/ + data_dir: /usr/share/ooni oonid_api_port: 8042 tor: #socks_port: 8801 diff --git a/requirements.txt b/requirements.txt index 5fb1ff9..638b33b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 # XXX fix this once the following issue is resolved: https://github.com/appliedsec/pygeoip/issues/56 -https://github.com/appliedsec/pygeoip/archive/master.zip -#pygeoip>=0.3.1 +https://github.com/appliedsec/pygeoip/archive/master.zip#egg=pygeoip-0.3.1 +pygeoip>=0.3.1 txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6 diff --git a/setup.py b/setup.py index 8eccd4e..f761f30 100644 --- a/setup.py +++ b/setup.py @@ -2,41 +2,101 @@ #-*- coding: utf-8 -*- from ooni import __version__ +import urllib2 import os +import gzip from os.path import join as pj import sys from setuptools import setup -dependency_links = [ - 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' -] +def download_geoip_files(): + urls = [ + 'http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat…', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz' + ] + for url in urls: + target_gz_file = pj('data', os.path.basename(url)) + target_file = target_gz_file.replace('.gz', '') + + if os.path.isfile(target_file): + print "%s already exists. Skipping." % target_file + continue + + print "Downloading %s" % url + response = urllib2.urlopen(url) + + with open(target_gz_file, 'w+') as f: + f.write(response.read()) + + with open(target_file, 'w+') as f: + gf = gzip.open(target_gz_file, 'rb') + f.write(gf.read()) + gf.close() + + os.unlink(target_gz_file) + +download_geoip_files() usr_share_path = '/usr/share/ooni' # If this is true then it means we are in a virtualenv +# therefore we should not place our data files inside /usr/share/ooni, but +# place them inside the virtual env system prefix. if hasattr(sys, 'real_prefix'): - usr_share_path = pj(sys.prefix, 'share', 'ooni') + usr_share_path = os.path.abspath(pj(sys.prefix, 'share', 'ooni')) + if not os.path.isdir(usr_share_path): + os.makedirs(usr_share_path) with open(pj('data', 'ooniprobe.conf.sample.new'), 'w+') as w: with open(pj('data', 'ooniprobe.conf.sample')) as f: for line in f: if line.startswith(' data_dir: /usr/share/ooni'): w.write(' data_dir: %s\n' % usr_share_path) + elif line.startswith(' geoip_data_dir: /usr/share/'): + w.write(' geoip_data_dir: %s\n' % usr_share_path) else: w.write(line) os.rename(pj('data', 'ooniprobe.conf.sample.new'), pj('data', 'ooniprobe.conf.sample')) -data_files = [] + data_files = [( + usr_share_path + '/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] +else: + data_files = [( + '/usr/share/geoip/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] + for root, dirs, file_names in os.walk('data/'): files = [] for file_name in file_names: - if not file_name.endswith('.pyc'): - files.append(pj(root, file_name)) + if file_name.endswith('.pyc'): + continue + elif file_name.endswith('.dat') and \ + file_name.startswith('Geo'): + continue + files.append(pj(root, file_name)) data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) install_requires = [] +dependency_links = [ + 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' +] with open('requirements.txt') as f: for line in f: - if line.startswith("#") or line.startswith('http'): + if line.startswith("#"): + continue + if line.startswith('https'): + dependency_links.append(line) continue install_requires.append(line) @@ -54,7 +114,6 @@ setup( 'ooni.nettests.blocking', 'ooni.nettests.third_party', 'ooni.templates', 'ooni.tests', 'ooni.utils'], - scripts=["bin/ooniprobe"], dependency_links=dependency_links, install_requires=install_requires [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2014