February 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Only run test_https.py tests if a BridgeDB process is already running.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 1bfb9c5fce4b47bc7990a2565cbb153c991cfeb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:42:56 2014 +0000 Only run test_https.py tests if a BridgeDB process is already running. --- lib/bridgedb/test/test_https.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 7b1c8c8..176b769 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -26,6 +26,10 @@ from __future__ import print_function from twisted.trial import unittest from BeautifulSoup import BeautifulSoup import mechanize +import os + +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID HTTPS_ROOT = 'https://127.0.0.1:6789' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -33,6 +37,11 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): + here = os.getcwd() + topdir = here.rstrip('_trial_temp') + self.rundir = os.path.join(topdir, 'run') + self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') + self.pid = getBridgeDBPID(self.pidfile) self.br = None def tearDown(self): @@ -132,6 +141,9 @@ class HTTPTests(unittest.TestCase): return bridges def test_get_obfs2_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -144,6 +156,9 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -156,6 +171,9 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage() @@ -168,6 +186,9 @@ class HTTPTests(unittest.TestCase): self.assertTrue(bridge != None) def test_get_scramblesuit_ipv4(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + self.openBrowser() self.goToOptionsPage()

1 0

[bridgedb/master] Fix yet another type error in test_Bucket.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 7c6f68326a920ca6ee9f3089acc493690af303a2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 07:23:01 2014 +0000 Fix yet another type error in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index 5e39260..fa3bb7e 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -35,7 +35,7 @@ class BucketDataTest(unittest.TestCase): distname = "test-distributor" bucket = Bucket.BucketData(distname, needed) this(bucket.name).should.be.equal(distname) - this(bucket.needed).should.be.equal(Bucket.BUCKET_MAX_BRIDGES) + this(bucket.needed).should.be.equal(needed) def test_alloc_all_the_bridges(self): """Set the needed number of bridges to the default"""

1 0

[bridgedb/master] Bump Leekspin requirement to version 0.2.1.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 41410f917297a8e667bfabf899477c300254c20f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 03:22:40 2014 +0000 Bump Leekspin requirement to version 0.2.1. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index 12dfb7b..f1f85ab 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==3.7.1 -leekspin==0.2.0 +leekspin==0.2.1 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 37b7bfe..b84396b 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==3.7.1 coveralls==0.4.2 -leekspin==0.2.0 +leekspin==0.2.1 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/setup.py b/setup.py index cc2bd32..e3463c9 100644 --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7.1", - "leekspin==0.2.0"]}, + "leekspin==0.2.1"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/master] Add missing SkipTest import in test_https.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 4deffa3ebdd6214714ad106ed6e342fecb53b087 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:58:25 2014 +0000 Add missing SkipTest import in test_https.py. --- lib/bridgedb/test/test_https.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 95c2be8..b8034d8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -28,7 +28,9 @@ import mechanize import os from BeautifulSoup import BeautifulSoup + from twisted.trial import unittest +from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID

1 0

[bridgedb/master] Merge branch 'fix/9874-https' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit a580c4ba0d30f55546d3d181d7ea878e6a13133c Merge: 9729bd1 4deffa3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:59:17 2014 +0000 Merge branch 'fix/9874-https' into develop lib/bridgedb/test/test_https.py | 2 ++ 1 file changed, 2 insertions(+)

1 0

[bridgedb/master] Document parameter in bridgedb.test.util.processExists().
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit f5360f503b280b56c58488c8ecb215f0952f2927 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:33:50 2014 +0000 Document parameter in bridgedb.test.util.processExists(). --- lib/bridgedb/test/util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 8627281..4c6f795 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -66,8 +66,9 @@ def fileCheckDecorator(func): return wrapper def processExists(pid): - """Test if **pid** exists. + """Test if the process with **pid** exists. + :param int pid: An integer specifying the process ID. :raises: OSError, if ``OSError.errno`` wasn't an expected errno (according to the "ERRORS" section from ``man 2 kill``). :rtype: bool

1 0

[bridgedb/master] Rename pidExists() to processExists() in bridgedb.test.util.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit e4a406b9533e8e1e9295a9369ebb796e7655691e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:31:39 2014 +0000 Rename pidExists() to processExists() in bridgedb.test.util. --- lib/bridgedb/test/test_bridgedb.py | 2 +- lib/bridgedb/test/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 8627aed..750ddd4 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -20,7 +20,7 @@ import time from twisted.trial import unittest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import pidExists +from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 287fa26..8627281 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -65,7 +65,7 @@ def fileCheckDecorator(func): % (str(description), dst, src)) return wrapper -def pidExists(pid): +def processExists(pid): """Test if **pid** exists. :raises: OSError, if ``OSError.errno`` wasn't an expected errno (according

1 0

[bridgedb/master] Merge branch 'fix/9874-https' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 9566aa05021f68523a974eb1d7f5ddd57cb3e4cf Merge: 9729bd1 4deffa3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:59:17 2014 +0000 Merge branch 'fix/9874-https' into develop lib/bridgedb/test/test_https.py | 2 ++ 1 file changed, 2 insertions(+)

1 0

[bridgedb/master] Add unittests for bridgedb.bridgerequest.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 1e7e8324ddb113920348990172e194440f322f55 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 21 02:42:14 2014 +0000 Add unittests for bridgedb.bridgerequest. --- lib/bridgedb/test/test_bridgerequest.py | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/lib/bridgedb/test/test_bridgerequest.py b/lib/bridgedb/test/test_bridgerequest.py new file mode 100644 index 0000000..1db8814 --- /dev/null +++ b/lib/bridgedb/test/test_bridgerequest.py @@ -0,0 +1,44 @@ +# -*- 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-2014, The Tor Project, Inc. +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + + +from twisted.trial import unittest + +from bridgedb import bridgerequest +from bridgedb.bridgerequest import IBridgeRequest +from bridgedb.bridgerequest import BridgeRequestBase + + +class BridgeRequestBaseTests(unittest.TestCase): + """Unittests for :class:`bridgedb.bridgerequest.BridgeRequestBase`.""" + + def setUp(self): + """Setup test run.""" + self.request = BridgeRequestBase() + + def test_BridgeRequestBase_implements_IRequestBridges(self): + """BridgeRequestBase should implement IRequestBridges interface.""" + self.assertTrue(IBridgeRequest.implementedBy(BridgeRequestBase)) + + def test_BridgeRequestBase_withoutBlockInCountry(self): + """BridgeRequestBase.withoutBlockInCountry() should add the country CC + to the ``notBlockedIn`` attribute. + """ + self.request.withoutBlockInCountry('US') + self.assertIn('US', self.request.notBlockedIn) + + def test_BridgeRequestBase_withPluggableTransportType(self): + """BridgeRequestBase.withPluggableTransportType() should add the + pluggable transport type to the ``transport`` attribute. + """ + self.request.withPluggableTransportType('huggable-transport') + self.assertIn('huggable-transport', self.request.transports)

1 0

[bridgedb/master] PEP8 OCD import rearrangements in test_smtp.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 82f4654c5db6919fa7b99312de5c611fd874af5e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:46:17 2014 +0000 PEP8 OCD import rearrangements in test_smtp.py. --- lib/bridgedb/test/test_smtp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 51d08f5..176492f 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -1,16 +1,17 @@ """integration tests for BridgeDB .""" from __future__ import print_function -from twisted.trial import unittest import smtplib -from smtpd import SMTPServer import asyncore import threading import Queue import random import os +from smtpd import SMTPServer + +from twisted.trial import unittest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists

1 0