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

[bridgedb/master] Fix missing word in docstring.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c38e733a1338bcbdd8ac28fc0e79516337f870e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 07:43:42 2013 +0000 Fix missing word in docstring. --- lib/bridgedb/test/test_Tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index 99295d6..00994b5 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -92,7 +92,7 @@ def monkeypatchTests(): class DynamicTestCaseMeta(type): - """You how scary the seemingly-arbitrary constants in elliptic curve + """You know how scary the seemingly-arbitrary constants in elliptic curve cryptography seem? Well, I am over nine thousand times more scary. Dynamic warez… beware! Be afraid; be very afraid.

1 0

[bridgedb/master] Skip testDiscountAndPruneBridgeHistory() unittest in travis CI.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 5bbe2290025f6766ae03c1cea4ff3ccffcbcf7a3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 08:24:53 2013 +0000 Skip testDiscountAndPruneBridgeHistory() unittest in travis CI. --- .travis.yml | 14 +++++--------- lib/bridgedb/Tests.py | 7 +++++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd1f287..d4f86c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,22 +27,18 @@ python: - "2.6" - "2.7" -#services: -# - couchdb - install: - pip install -r requirements.txt --use-mirrors - pip install coverage==3.7 coveralls==0.3 sure==1.2.2 --use-mirrors - make install -#before_script: -# # For testing with CouchDB -# - curl -X PUT localhost:5984/myapp_test +env: + - TRAVIS_CI=true -script: +before_script: - bridgedb mock -n 250 - # Normally, we would do 'bridgedb test' here, but to run with coverage we - # have to do this instead: + +script: - coverage run $(which trial) ./lib/bridgedb/test/test_*.py - coverage report diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 52040e0..c1b531c 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -757,13 +757,16 @@ class BridgeStabilityTests(unittest.TestCase): def testDiscountAndPruneBridgeHistory(self): """ Test pruning of old Bridge History """ + if os.environ.get('TRAVIS_CI'): + unittest.skip("Hangs on Travis-CI.") + db = self.db # make a bunch of bridges num_bridges = 20 time_start = time.time() - bridges = [ random.choice([fakeBridge, fakeBridge6])() \ - for i in xrange(num_bridges) ] + bridges = [random.choice([fakeBridge, fakeBridge6])() + for i in xrange(num_bridges)] # run some of the bridges for the full time series running = bridges[:num_bridges/2]

1 0

[bridgedb/master] Cat bridgedb.log out after a travis CI run.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9e967be24796576732ff988189375e1f6ccd2fd6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 07:45:25 2013 +0000 Cat bridgedb.log out after a travis CI run. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c9eabc2..fd1f287 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,3 +48,4 @@ script: after_success: - coveralls + - cat bridgedb.log

1 0

[bridgedb/master] Actually skip that unittest that hangs in travis CI.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 0d6b6a7f0aa9a0e597c2b0403847f61d42e04a4b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 08:37:05 2013 +0000 Actually skip that unittest that hangs in travis CI. --- lib/bridgedb/Tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index c1b531c..378f1ae 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -757,8 +757,8 @@ class BridgeStabilityTests(unittest.TestCase): def testDiscountAndPruneBridgeHistory(self): """ Test pruning of old Bridge History """ - if os.environ.get('TRAVIS_CI'): - unittest.skip("Hangs on Travis-CI.") + if os.environ.get('TRAVIS'): + self.skipTest("Hangs on Travis-CI.") db = self.db

1 0

[bridgedb/master] Remove unused Travis CI env variable.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 34db641a25cbb62988e510249ed3b06f9bf04b31 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 08:57:12 2013 +0000 Remove unused Travis CI env variable. [ci skip] --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4f86c2..39852b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,6 @@ install: - pip install coverage==3.7 coveralls==0.3 sure==1.2.2 --use-mirrors - make install -env: - - TRAVIS_CI=true - before_script: - bridgedb mock -n 250

1 0

[bridgedb/master] Only log netstatus descriptor fields if they were parsed.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 40d39d583c7392111cbe57fa816c8e119180a74d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 5 17:23:46 2014 +0000 Only log netstatus descriptor fields if they were parsed. * CHANGE bridgedb.Bridges.parseStatusFile() to only log networkstatus descriptor fields if the parsers were actually able to parse them. Otherwise we waste a lot of log lines with blank values. --- lib/bridgedb/Bridges.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 01de8b7..328cd2e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -508,11 +508,12 @@ def parseStatusFile(networkstatusFile): logging.debug("Parsed networkstatus line:") logging.debug(" Nickname: %s" % nickname) logging.debug(" Identity: %s" % toHex(ID)) - logging.debug(" Descriptor: %s" % descDigest) - logging.debug(" Timestamp: %s" % timestamp) - logging.debug(" ORAddress: %s" % ORaddr) - logging.debug(" ORport: %s" % ORport) - logging.debug(" dirport: %s" % dirport) + if descDigest: + logging.debug(" Descriptor: {0}".format(toHex(descDigest))) + logging.debug(" Timestamp: {0}".format(timestamp)) + logging.debug(" ORAddress: {0}".format(ORaddr)) + logging.debug(" ORport: {0}".format(ORport)) + logging.debug(" dirport: {0}".format(dirport)) elif ID and line.startswith("a "): try:

1 0

[bridgedb/master] Merge branch 'fix/9873-convert-old-unittests_r3' into develop
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9f8144961d0e98ed047ca0318287bc0a88b63488 Merge: 21d0361 34db641 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 09:20:12 2013 +0000 Merge branch 'fix/9873-convert-old-unittests_r3' into develop .gitignore | 2 + .travis.yml | 20 +- lib/bridgedb/Bridges.py | 15 +- lib/bridgedb/Dist.py | 7 +- lib/bridgedb/Tests.py | 87 ++++++--- lib/bridgedb/Time.py | 14 +- lib/bridgedb/crypto.py | 8 +- lib/bridgedb/test/deprecated.py | 149 +++++++++++++++ lib/bridgedb/test/test_Tests.py | 248 +++++++++++++++++++++++++ lib/bridgedb/test/test_parse_networkstatus.py | 11 +- lib/bridgedb/test/test_persistent.py | 8 +- lib/bridgedb/test/util.py | 48 ++--- 12 files changed, 530 insertions(+), 87 deletions(-)

1 0

[bridgedb/master] Return True if we were able to prepopulate sub hashrings.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 2f115411616b3a477aff94bb3def6c15a32704f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 5 17:28:19 2014 +0000 Return True if we were able to prepopulate sub hashrings. In bridgedb.Bridges.FilteredBridgeSplitter.prepopulateRings(), we return False if we were unable to prepopulate bridges into the sub hashring for whatever reason. In case some calling function wants to use the boolean return value as a check, we should mirror this logic and return True if prepopulation was successful. --- lib/bridgedb/Bridges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 328cd2e..be88001 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1026,6 +1026,8 @@ class FilteredBridgeSplitter(BridgeHolder): logging.info("Inserted %d bridges into hashring %s!" % (inserted, ringname)) + return True + def dumpAssignments(self, f, description=""): # one ring per filter set # bridges may be present in multiple filter sets

1 0

[bridgedb/master] Update docstring for bridgedb.Bridges.FilteredBridgeSplitter.prepopulateRings().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 122fad73e14e1ae7de73691ab002923690c4f93d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 5 17:31:55 2014 +0000 Update docstring for bridgedb.Bridges.FilteredBridgeSplitter.prepopulateRings(). --- lib/bridgedb/Bridges.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index be88001..c59d5ee 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -993,13 +993,16 @@ class FilteredBridgeSplitter(BridgeHolder): :type subring: :class:`BridgeHolder` :param subring: The subring to add. - :param string ringname: A unique name for identifying the new - subring. + :param str ringname: A unique name for identifying the new subring. :param filterFn: A function whose input is a :class:`Bridge`, and - returns True/False based on some filtration criteria. + returns True/False based on some filtration criteria. :type populate_from: iterable or None :param populate_from: A group of :class:`Bridge`s. If given, the newly - added subring will be populated with these bridges. + added subring will be populated with these + bridges. + :rtype: bool + :returns: False if there was a problem adding the subring, True + otherwise. """ if not isinstance(subring, BridgeHolder): logging.fatal("Can't add '%s' to %s because '%s' isn't a hashring."

1 0

[bridgedb/master] Cleanup logging of memory addresses in prepopulateRings().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 6673109c8bf0da40123e53be3d1b37696ee503ab Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 5 17:33:08 2014 +0000 Cleanup logging of memory addresses in prepopulateRings(). The logging before was quite messy. The sub hashrings are identified by the HMAC of a unique string. It turns out that the "unique string" which is used in this case is actually something which looks like the class.__repr__() for a bridgedb.Bridges.BridgeHolder subclass. This is *probably* unique because it contains memory addresses of the newly generated hmac_fn()s, which are likely (though not necessarily) unique. This is a bit gross, in my opinion, but it's not really a problem. However, the log messages this function generated are a problem. They contain memory addresses, which isn't the greatest idea, ignoring all other reasons, simply because it's illegible. * REFACTOR logging statements in bridgedb.Bridges.FilteredBridgeSplitter.prepopulateRings() to remove logging of hmac_fn() memory addresses. * ADD a long comment detailing the "unique strings" which identify a sub hashring, and how they should probably be changed someday. --- lib/bridgedb/Bridges.py | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index c59d5ee..5b07141 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1004,30 +1004,57 @@ class FilteredBridgeSplitter(BridgeHolder): :returns: False if there was a problem adding the subring, True otherwise. """ + # XXX I think subring and ringname are switched in this function, or + # at least that whatever is passed into this function as as the + # `ringname` parameter from somewhere else is odd; for example, with + # the original code, which was `log.debug("Inserted %d bridges into + # hashring '%s'!" % (inserted, ringname))`, this log message appears: + # + # Jan 04 23:18:37 [INFO] Inserted 12 bridges into hashring + # frozenset([<function filterBridgesByIP4 at 0x2d67cf8>, <function + # filterAssignBridgesToRing(<function hmac_fn at 0x3778398>, 4, 0) at + # 0x37de578>])! + # + # I suppose since it contains memory addresses, it *is* technically + # likely to be a unique string, but it is messy. + + hashringName = self.__class__.__name__ + subringName = subring.__class__ + filterNames = [] + if not isinstance(subring, BridgeHolder): - logging.fatal("Can't add '%s' to %s because '%s' isn't a hashring." - % (ringname, self.__class__, ringname)) + logging.fatal("Can't add %r to %s because %r isn't a hashring." + % (ringname, hashringName, ringname)) return False if ringname in self.filterRings.keys(): logging.fatal("Hashring %s already has a subring named '%s'!" % (self.__class__, ringname)) return False - logging.debug("Adding subring '%s' to hashring %s..." - % (ringname, self.__class__)) + for filterName in [x.func_name for x in list(ringname)]: + # Using `filterAssignBridgesToRing.func_name` gives us a messy + # string which includes all parameters and memory addresses. Get + # rid of this by partitioning at the first `(`: + realFilterName = filterName.partition('(')[0] + filterNames.append(realFilterName) + filterNames = ' '.join(filterNames) + + logging.debug("Adding subring to %s hashring:" % hashringName) + logging.debug(" Subring class: %r" % subringName) + logging.debug(" Subring filters: %s" % filterNames) #TODO: drop LRU ring if len(self.filterRings) > self.max_cached_rings self.filterRings[ringname] = (filterFn, subring) if populate_from: - logging.info("Populating hashring %s..." % ringname) + logging.info("Populating hashring %s..." % subringName) inserted = 0 for bridge in populate_from: if isinstance(bridge, Bridge) and filterFn(bridge): subring.insert(bridge) inserted += 1 - logging.info("Inserted %d bridges into hashring %s!" - % (inserted, ringname)) + logging.info("Inserted %d bridges into hashring with filters: %s" + % (inserted, filterNames)) return True

1 0