commit 0d6b6a7f0aa9a0e597c2b0403847f61d42e04a4b Author: Isis Lovecruft isis@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