January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Add doc/HACKING.md and move the "Maintenance Notes" from README to it.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e7c8b8fbaddf141c57da52f7a271278b23bcceb5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 06:36:59 2013 +0000 Add doc/HACKING.md and move the "Maintenance Notes" from README to it. --- README | 31 ------------------------------- doc/HACKING.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 31 deletions(-) diff --git a/README b/README index 12c6c18..0ebb164 100644 --- a/README +++ b/README @@ -241,34 +241,3 @@ equal to "get bridges" will get answered, assuming the domain is okay. ### Support Send your questions to isis (A) torproject (circle) org. - -### Maintainer's Notes - -#### Bumping the version number - -Bumping the version number at release time (which, for BridgeDB really means -deploy time, as of right now) means doing the following: - - $ git checkout develop - [merge some fix/bug/feature/etc branches] - $ git checkout -b release-0.0.2 develop - $ git tag -a -s bridgedb-0.0.2 - [pip maintainance commands *would* go here, if we ever have any] - $ git checkout master - $ git merge -S --no-ff release-0.0.2 - $ git checkout develop - $ git merge -S --no-ff master - $ git push <remote> master develop - -And be sure not to forget to do: - - $ git push --tags - -If the currently installed version is *not* from one of the signed tags, the -version number attribute created by versioneer will be the short ID of the git -commit from which the installation took place, prefixed with the most recent -tagged release at that point, i.e.: - - >>> import bridgedb - >>> bridgedb.__version__ - 0.0.1-git528ff30c diff --git a/doc/HACKING.md b/doc/HACKING.md new file mode 100644 index 0000000..0fda25a --- /dev/null +++ b/doc/HACKING.md @@ -0,0 +1,56 @@ + +# -*- mode: markdown ; coding: utf-8 -*- + +HACKING +======= + +Hack on whatever you like. Ticket are [here][trac]. If you're doing something +big that doesn't have a ticket, you should probably make one. If you don't +want to register for a Trac account, you can use the ```cypherpunks``` account +with password ```writecode```. + +## Git Workflow + +See this article on git branching [workflow][workflow]. The only modifications +we make are: + + * Tagging is done in the ```release-*``` branches, rather than in master. + * It's okay to use either the ```feature/*``` and ```fix/*``` branch naming + scheme, or follow little-t Tor's branch naming scheme, + i.e. ```bug666-description-r1```. + +## Making a release + +### Bumping the version number + +Bumping the version number at release time (which, for BridgeDB really means +deploy time, as of right now) means doing the following: + + $ git checkout develop + [merge some fix/bug/feature/etc branches] + $ git checkout -b release-0.0.2 develop + $ git tag -a -s bridgedb-0.0.2 + [pip maintainance commands *would* go here, if we ever have any] + $ git checkout master + $ git merge -S --no-ff release-0.0.2 + $ git checkout develop + $ git merge -S --no-ff master + $ git push <remote> master develop + +And be sure not to forget to do: + + $ git push --tags + +If the currently installed version is *not* from one of the signed tags, the +version number attribute created by versioneer will be the short ID of the git +commit from which the installation took place, prefixed with the most recent +tagged release at that point, i.e.: + + >>> import bridgedb + >>> bridgedb.__version__ + 0.0.1-git528ff30c + +References +---------- +[trac]: https://trac.torproject.org/projects/tor/query?status=accepted&status=assig… +[workflow]: http://nvie.com/posts/a-successful-git-branching-model/

1 0

[bridgedb/master] It's not 2009 anymore…
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit dd7c6eadc921bd9c6904e6cc66c2ffebf8d060b2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 16 04:32:18 2013 +0000 It's not 2009 anymore… (cherry picked from commit e2a7f9319310a3c23a0c110963071cb1f4592c76) --- LICENSE | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1cea29e..a7d2320 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ -BridgeDB is distributed under this license: +BridgeDB, a Tor bridge relay distribution system, is distributed under the +3-clause BSD license: -Copyright (c) 2007-2009, The Tor Project, Inc. +Copyright (c) 2007-2013, The Tor Project, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are

1 0

[bridgedb/master] Add Makefile directives for pylint/pyflakes/pep8 code checks.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 483717e2a3c342f182d596ce6a262ce23e6f27e6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 07:14:19 2013 +0000 Add Makefile directives for pylint/pyflakes/pep8 code checks. * ADD .pylintrc to tweak pylint a bit; otherwise it warns about some rather ridiculous things. --- .pylintrc | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 9 +++ 2 files changed, 258 insertions(+) diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..ab53c88 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,249 @@ +[MASTER] + +# Specify a configuration file. +#rcfile=./.pylintrc + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +init-hook="import sys,os;a=os.getcwd();print a;sys.path.insert(0, os.path.join(a, 'lib'));" + +# Profiled execution. +profile=no + +# Add files or directories to the blacklist. They should be base names, not +# paths. +ignore=CVS,test,templates + +# Pickle collected data for later comparisons. +persistent=yes + +# List of plugins (as comma separated values of python modules names) to load, +# usually to register additional checkers. +load-plugins= + + +[MESSAGES CONTROL] + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time. +#enable= + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). +#disable= + + +[REPORTS] + +# Set the output format. Available formats are text, parseable, colorized, msvs +# (visual studio) and html +output-format=text + +# Include message's id in output +include-ids=yes + +# Put messages in a separate file for each module / package specified on the +# command line instead of printing them on stdout. Reports (if any) will be +# written in a file name "pylint_global.[txt|html]". +files-output=no + +# Tells whether to display a full report or only the messages +reports=yes + +# Python expression which should return a note less than 10 (10 is the highest +# note). You have access to the variables errors warning, statement which +# respectively contain the number of errors / warnings messages and the total +# number of statements analyzed. This is used by the global evaluation report +# (RP0004). +evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) + +# Add a comment according to your evaluation note. This is used by the global +# evaluation report (RP0004). +comment=no + + +[BASIC] + +# Required attributes for module, separated by a comma +required-attributes= + +# List of builtins function names that should not be used, separated by a comma +bad-functions=map,filter,apply,input + +# Regular expression which should only match correct module names +module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ + +# Regular expression which should only match correct module level names +const-rgx=(([a-zA-Z0-9_]*)|(__.*__))$ + +# Regular expression which should only match correct class names +class-rgx=[A-Z_][a-zA-Z0-9]+$ + +# Regular expression which should only match correct function names +function-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Regular expression which should only match correct method names +method-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Regular expression which should only match correct instance attribute names +attr-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Regular expression which should only match correct argument names +argument-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Regular expression which should only match correct variable names +variable-rgx=[a-z_][a-zA-Z0-9_]{1,30}$ + +# Regular expression which should only match correct list comprehension / +# generator expression variable names +inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ + +# Good variable names which should always be accepted, separated by a comma +good-names=i,j,k,ex,Run,_,err,exc,func,fn,fh + +# Bad variable names which should always be refused, separated by a comma +bad-names=foo,bar,baz,toto,tutu,tata + +# Regular expression which should only match functions or classes name which do +# not require a docstring +no-docstring-rgx=__.*__ + + +[FORMAT] + +# Maximum number of characters on a single line. +max-line-length=79 + +# Maximum number of lines in a module +max-module-lines=1500 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + + +[SIMILARITIES] + +# Minimum lines number of a similarity. +min-similarity-lines=4 + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + + +[TYPECHECK] + +# Tells whether missing members accessed in mixin class should be ignored. A +# mixin class is detected if its name ends with "mixin" (case insensitive). +ignore-mixin-members=yes + +# List of classes names for which member attributes should not be checked +# (useful for classes with attributes dynamically set). +ignored-classes=SQLObject + +# When zope mode is activated, add a predefined set of Zope acquired attributes +# to generated-members. +zope=yes + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E0201 when accessed. Python regular +# expressions are accepted. +generated-members=REQUEST,acl_users,aq_parent + + +[VARIABLES] + +# Tells whether we should check for unused import in __init__ files. +init-import=yes + +# A regular expression matching the beginning of the name of dummy variables +# (i.e. not used). +dummy-variables-rgx=_|dummy + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid to define new builtins when possible. +additional-builtins= + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME,XXX,DOC + + +[IMPORTS] + +# Deprecated modules which should not be used, separated by a comma +deprecated-modules=regsub,string,TERMIOS,Bastion,rexec,sha + +# Create a graph of every (i.e. internal and external) dependencies in the +# given file (report RP0402 must not be disabled) +#import-graph=pylint-import-graph.plain + +# Create a graph of external dependencies in the given file (report RP0402 must +# not be disabled) +ext-import-graph= + +# Create a graph of internal dependencies in the given file (report RP0402 must +# not be disabled) +int-import-graph= + + +[CLASSES] + +# List of interface methods to ignore, separated by a comma. This is used for +# instance to not check methods defines in Zope's Interface base class. +ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__,__new__,setUp + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + + +[DESIGN] + +# Maximum number of arguments for function / method +max-args=9 + +# Argument names that match this expression will be ignored. Default to name +# with leading underscore +ignored-argument-names=_.* + +# Maximum number of locals for function / method body +max-locals=15 + +# Maximum number of return / yield for function / method body +max-returns=6 + +# Maximum number of branch for function / method body +max-branchs=12 + +# Maximum number of statements in function / method body +max-statements=50 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when being caught. Defaults to +# "Exception" +overgeneral-exceptions=Exception diff --git a/Makefile b/Makefile index 43dfa38..29aed8f 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,15 @@ all: test: python setup.py test +pep8: + find lib/bridgedb/*.py | xargs pep8 + +pylint: + pylint --rcfile=./.pylintrc ./lib/bridgedb/ + +pyflakes: + pyflakes lib/bridgedb/ + install: -python setup.py compile_catalog python setup.py install --record installed-files.txt

1 0

[bridgedb/master] Update dependencies and install instructions in .travis.yml and README.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 625549492522f08ebb0e185fa9fcc4b70808650e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 13:55:42 2013 +0000 Update dependencies and install instructions in .travis.yml and README. --- .travis.yml | 9 ++------- README | 30 +++++++++++++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 735b214..48c8384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,19 +11,14 @@ notifications: on_success: change on_failure: change before_install: - - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list - - gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 - - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - - sudo apt-get update - - sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 + - sudo apt-get install tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev python: - "2.6" - "2.7" install: - pip install -r requirements.txt --use-mirrors - - python setyp.py build - - python setup.py compile_catalog - - python setup.py install + - make install # command to run tests, e.g. python setup.py test script: - test -d run || mkdir run diff --git a/README b/README index 0ebb164..98f20c2 100644 --- a/README +++ b/README @@ -40,24 +40,28 @@ BridgeDB requires the following OS-level dependencies: - python>=2.7 - python-dev + - build-essential + - libgpgme11-dev - OpenSSL>=1.0.1e - [SQLite3](http://www.maxmind.com/app/python) - - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) + - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) (packaged + in Debian as tor-geoipdb) - [python-setuptools](https://pypi.python.org/pypi/setuptools) As well as any Python dependencies in requirements.txt. ### Deploying BridgeDB in a Python virtualenv - - Install Python 2.6 or later, and other OS-level dependencies. On Debian, + - Install Python 2.7 or later, and other OS-level dependencies. On Debian, you can do: - sudo apt-get install python openssl sqlite3 tor-geoip + sudo apt-get install build-essential python python-dev \ + python-setuptools openssl sqlite3 tor-geoip libgpgme11-dev - - Install Pip 1.3.1 or later. Debian sid has this version, but if you're - tracking a different release, the easiest way to install a newer Pip is to - use the Pip development teams's - [getpip script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py): + - Install Pip 1.3.1 or later. Debian has this version, but if for some reason + that or a newer version isn't available, the easiest way to install a newer + Pip is to use the Pip development teams's [getpip + script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py): wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py sudo python get-pip.py @@ -207,12 +211,16 @@ Enter the following commands at the ```sqlite>``` prompt: ## Running BridgeDB -To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do: + +To run BridgeDB, simply make any necessary changes to bridgedb.conf, navigate +to the runtime directory (the ```RUN_IN_DIR``` option in bridgedb.conf), and +do: bridgedb -c bridgedb.conf -When you have new lists of bridges, replace the old files and send the process -a SIGHUP. +When you have new lists of bridges, replace the old files and do: + + bridgedb --reload Make sure that the files and directories referred to in bridgedb.conf exist. However, many of them, if not found, will be touched on disk so that @@ -230,7 +238,7 @@ foobar-2010-07-17.brdgs. The first file would contain 10 bridges from BridgeDB's 'unallocated' pool. The second file would contain 15 bridges from the same pool and the third one similarly 3 bridges. These files can then be handed out to trusted parties via mail or fed to other distribution mechanisms -such as twitter. +such as Twitter. #### To use with HTTPS: Just connect to the appropriate port.

1 0

[bridgedb/master] Add .travis.yml file.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 56f4a48845f94e81471e52e870945bfe028d59ad Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 13:31:16 2013 +0000 Add .travis.yml file. --- .travis.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..735b214 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,47 @@ +language: python +notifications: + irc: + channels: + - "irc.oftc.net#tor-bots" + on_success: always + on_failure: always + email: + recipients: + - isis(a)torproject.org + on_success: change + on_failure: change +before_install: + - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list + - gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 + - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - + - sudo apt-get update + - sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 +python: + - "2.6" + - "2.7" +install: + - pip install -r requirements.txt --use-mirrors + - python setyp.py build + - python setup.py compile_catalog + - python setup.py install +# command to run tests, e.g. python setup.py test +script: + - test -d run || mkdir run + - openssl genrsa -des3 -passout pass:bridgedb -out privkey 4096 + - openssl req -batch -passin pass:bridgedb -new -key privkey -out server.csr + - cp privkey privkey.nopasswd + - openssl rsa -passin pass:bridgedb -in privkey.nopasswd -out privkey.pem + - openssl x509 -req -days 365 -in server.csr -signkey privkey.pem -out cert + - test -f "privkey.nopasswd" && rm -f privkey.nopasswd + - test -f "server.csr" && rm -f server.csr + - test -f "privkey" && rm -f privkey + - mv privkey.pem ./run/ + - mv cert ./run/ + - cp ./bridgedb.conf ./run/ + - chmod +x .travis.test.sh + - cd run + - gen_bridge_descriptors 2000 + - ../.travis.test.sh 30 bridgedb -c bridgedb.conf + - python setup.py test + - bridgedb trial + - echo "Build successful."

1 0

[bridgedb/master] Add opt module with updated options parsers.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 2da70e4215c9026e71d28a2ebd01cbce75b04b38 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 13:59:00 2013 +0000 Add opt module with updated options parsers. --- lib/bridgedb/opt.py | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/lib/bridgedb/opt.py b/lib/bridgedb/opt.py new file mode 100644 index 0000000..628f04d --- /dev/null +++ b/lib/bridgedb/opt.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +"""Classes for commandline options parsing. + +** Module Overview: ** + +""" + +from __future__ import print_function + +import sys +import textwrap + +from twisted.python import usage + +# from ._version import get_versions +# __version__ = get_versions()['version'] +# del get_versions +from bridgedb import __version__ + + +def parseOptions(): + """Create the main options parser and its subcommand parsers. + + Any :exc:`~twisted.python.usage.UsageErrors` which are raised due to + invalid options are ignored; their error message is printed and then we + exit the program. + + :rtype: :class:`MainOptions` + :returns: The main options parsing class, with any commandline arguments + already parsed. + """ + options = MainOptions() + try: + options.parseOptions() + except usage.UsageError as uerr: + print(uerr.message) + sys.exit(1) + return options + + +class BaseOptions(usage.Options): + """Base options included in all main and sub options menus.""" + + longdesc = textwrap.dedent("""BridgeDB is a proxy distribution system for + private relays acting as bridges into the Tor network.""") + + optFlags = [['verbose', 'v', 'Log to stdout']] + + def __init__(self): + """Create an options parser. All flags, parameters, and attributes of + this base options parser are inherited by all child classes. + """ + usage.Options.__init__(self) + self['version'] = self.opt_version + + def opt_version(self): + """Display BridgeDB version and exit.""" + print("%s-%s" % (__package__, __version__)) + sys.exit() + + +class TestOptions(BaseOptions): + """Suboptions for running twisted.trial and unittest based tests.""" + + optFlags = [['coverage', 'c', 'Generate coverage statistics']] + optParameters = [ + ['descriptors', 'n', 1000, 'Generate <N> fake bridge descriptors'], + ['file', 'f', None, 'Run tests in specific file(s) (trial only)'], + ['unittests', 'u', False, 'Run unittests in bridgedb.Tests'], + ['trial', 't', True, 'Run twisted.trial tests in bridgedb.test']] + + completionData = usage.Completions( + mutuallyExclusive=[('unittests', 'coverage'), + ('unittests', 'file')], + optActions={'file': usage.CompleteFiles('lib/bridgedb/test/test_*.py', + repeat=True, + descr="test filename")}, + extraActions=[ + usage.Completer(descr="extra arguments to pass to trial")]) + + def parseArgs(self, *args): + """Parse any additional arguments after the options and flags.""" + self['test_args'] = args + + +class MainOptions(BaseOptions): + """Main commandline options parser for BridgeDB.""" + + optFlags = [ + ['reload', 'r', + 'Reload bridge descriptors by sending a SIGHUP to BridgeDB'], + ['dump-bridges', 'd', 'Dump bridges by hashring assignment into files']] + optParameters = [ + ['config', 'c', './bridgedb.conf', 'Configuration file']] + + subCommands = [ + ['test', None, TestOptions, + 'Run twisted.trial tests or unittests {}'.format( + '(see `bridgedb test --help`)')]]

1 0

[bridgedb/master] Fix three failing unittests in lib/bridgedb/Tests.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 514e93753dd33b33e5ff9540bc2f0d26113e5cbe Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 17 02:19:07 2013 +0000 Fix three failing unittests in lib/bridgedb/Tests.py. Three unittests were failing in lib/bridgedb/Tests.py due to changes made for users). They were: - testDistWithFilterBoth (bridgedb.Tests.IPBridgeDistTests) - testDistWithFilterIP4 (bridgedb.Tests.IPBridgeDistTests) - testDistWithFilterIP6 (bridgedb.Tests.IPBridgeDistTests) These were failing due to chopping the first 7 bytes off the the returned config lines, because they expected to see the "bridge " prefix and it's not there anymore. --- lib/bridgedb/Tests.py | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 2699ece..c1e994b 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -2,6 +2,8 @@ # Copyright (c) 2007-2009, The Tor Project, Inc. # See LICENSE for licensing information +from __future__ import print_function + import doctest import os import random @@ -279,11 +281,14 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[filterBridgesByIP6]) - address, portlist = bridgedb.Bridges.parseORAddressLine( - random.choice(b).getConfigLine(addressClass=ipaddr.IPv6Address)[7:]) + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP6]) + bridge = random.choice(bridges) + bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv6Address) + address, portlist = bridgedb.Bridges.parseORAddressLine(bridge_line) assert type(address) is ipaddr.IPv6Address - assert filterBridgesByIP6(random.choice(b)) + assert filterBridgesByIP6(random.choice(bridges)) def testDistWithFilterIP4(self): d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") @@ -292,12 +297,14 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[filterBridgesByIP4]) - address, portlist = bridgedb.Bridges.parseORAddressLine( - random.choice(b).getConfigLine(addressClass=ipaddr.IPv4Address)[7:]) + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP4]) + bridge = random.choice(bridges) + bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) + address, portlist = bridgedb.Bridges.parseORAddressLine(bridge_line) assert type(address) is ipaddr.IPv4Address - - assert filterBridgesByIP4(random.choice(b)) + assert filterBridgesByIP4(random.choice(bridges)) def testDistWithFilterBoth(self): d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") @@ -306,17 +313,20 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(50): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByIP4, filterBridgesByIP6]) - if b: - t = b.pop() + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", 1, + bridgeFilterRules=[ + filterBridgesByIP4, + filterBridgesByIP6]) + if bridges: + t = bridges.pop() assert filterBridgesByIP4(t) assert filterBridgesByIP6(t) address, portlist = bridgedb.Bridges.parseORAddressLine( - t.getConfigLine(addressClass=ipaddr.IPv4Address)[7:]) + t.getConfigLine(addressClass=ipaddr.IPv4Address)) assert type(address) is ipaddr.IPv4Address address, portlist = bridgedb.Bridges.parseORAddressLine( - t.getConfigLine(addressClass=ipaddr.IPv6Address)[7:]) + t.getConfigLine(addressClass=ipaddr.IPv6Address)) assert type(address) is ipaddr.IPv6Address

1 0

[bridgedb/master] Fix python2.6 syntax errors.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit e690b3ed22ad78b903ffd9d66b88fe757d1cead2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 14:48:32 2013 +0000 Fix python2.6 syntax errors. These were the result of using indexless format string syntax, which was introduced in Python-3.1 (and then it was backported to some versions of 2.7, but not 2.6, apparently). * FIXES a couple print statement syntax in lib/bridgedb/Tests.py causing test failure. The failing test was: - testDistWithFilterBlockedCountriesAdvanced (bridgedb.Tests.IPBridgeDistTests) --- lib/bridgedb/Tests.py | 2 +- lib/bridgedb/opt.py | 3 +-- setup.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index c1e994b..a761d00 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -398,7 +398,7 @@ class IPBridgeDistTests(unittest.TestCase): ]) try: assert len(b) > 0 except AssertionError: - print "epic fail" + print("epic fail") b = d.getBridgesForIP(randomIPString(), "x", 1, bridgeFilterRules=[ filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 diff --git a/lib/bridgedb/opt.py b/lib/bridgedb/opt.py index 628f04d..8018544 100644 --- a/lib/bridgedb/opt.py +++ b/lib/bridgedb/opt.py @@ -104,5 +104,4 @@ class MainOptions(BaseOptions): subCommands = [ ['test', None, TestOptions, - 'Run twisted.trial tests or unittests {}'.format( - '(see `bridgedb test --help`)')]] + "Run twisted.trial tests or unittests (see `bridgedb test --help`)"]] diff --git a/setup.py b/setup.py index 731a22e..d01f646 100644 --- a/setup.py +++ b/setup.py @@ -149,7 +149,7 @@ def get_supported_langs(): with open(repo_langs, 'r') as langsfile: for line in langsfile.readlines(): if line.startswith('supported'): - line = "supported = {}\n".format(supported) + line = "supported = %s\n" % supported print("REWROTE supported langs: %s" % line) new_langs_lines.append(line) with open(repo_langs, 'w') as newlangsfile:

1 0

[bridgedb/master] Run unittests before changing to the runtime tests directory.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 41e3a3d748760e26d4bc437ca1ab3cfd80535d22 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 15:00:23 2013 +0000 Run unittests before changing to the runtime tests directory. And Don't run trial-based tests until #9199's tests are merged. (cherry picked from commit 31cff62c026a94edd114a5adff2848899569c5f6) Created a new branch in order to drop commit 826f872e075a639250d565a8d93b1c405256f82d. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48c8384..276c5d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ notifications: on_failure: change before_install: - sudo apt-get update - - sudo apt-get install tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev + - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev python: - "2.6" - "2.7" @@ -21,6 +21,7 @@ install: - make install # command to run tests, e.g. python setup.py test script: + - python setup.py test - test -d run || mkdir run - openssl genrsa -des3 -passout pass:bridgedb -out privkey 4096 - openssl req -batch -passin pass:bridgedb -new -key privkey -out server.csr @@ -35,8 +36,8 @@ script: - cp ./bridgedb.conf ./run/ - chmod +x .travis.test.sh - cd run - - gen_bridge_descriptors 2000 - - ../.travis.test.sh 30 bridgedb -c bridgedb.conf - - python setup.py test - - bridgedb trial - - echo "Build successful." + - ../scripts/make-ssl-cert + - ../scripts/executioner 60 bridgedb -c bridgedb.conf +# add this when #9199's (or some other trial-based) tests are merged: +# - bridgedb test -n 2000 +# - echo "Build successful."

1 0

[bridgedb/master] Refactor scripts/bridgedb to use the new options and runner.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 831a778b054cf6425de953bb86eeae3be69ceac1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 15 14:08:14 2013 +0000 Refactor scripts/bridgedb to use the new options and runner. --- scripts/bridgedb | 54 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/scripts/bridgedb b/scripts/bridgedb index 8e8800b..0e20cd9 100644 --- a/scripts/bridgedb +++ b/scripts/bridgedb @@ -1,31 +1,43 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +from __future__ import print_function import bridgedb +import os import sys -if len(sys.argv) == 1: - from bridgedb import Main - Main.run() -else: - if sys.argv[1] in ('test', 'coverage'): - import os - from twisted.scripts import trial +from bridgedb import runner +from bridgedb import opt - if sys.argv[1] == 'coverage': - run_python_coverage = True - # Hack to set the PYTHONPATH: - sys.path[:] = map(os.path.abspath, sys.path) - sys.path.insert(0, os.path.abspath(os.getcwd())) +options = opt.parseOptions() - if run_python_coverage: - from coverage import coverage - cov = coverage() - cov.start() +if options.subCommand is not None: + # Hack to set the PYTHONPATH: + sys.path[:] = map(os.path.abspath, sys.path) + sys.path.insert(0, os.path.abspath(os.getcwd())) + sys.path.insert(0, os.path.abspath(os.path.join(os.getcwd(), '../lib'))) - sys.argv = ['trial', 'bridgedb'] - trial.run() + if 'descriptors' in options.subOptions: + runner.generateDescriptors(options.subOptions['descriptors']) - if run_python_coverage: - cov.stop() - cov.html_report('.coverage-results') + if options.subCommand == 'test': + if options.subOptions['trial']: + runner.runTrial(options.subOptions) + if options.subOptions['unittests']: + runner.runTests(options.subOptions) + sys.exit() + +# If no suboption was given, just run bridgedb: +else: + from bridgedb import Main + Main.run(options)

1 0