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

[bridgedb/develop] Merge commit 'a580c4ba0d30f55546d3d181d7ea878e6a13133c' into develop
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 63d56a8142b7dba4eb4eec3da8f3d40a67d1cf59 Merge: b4f20eb a580c4b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 06:40:22 2014 +0000 Merge commit 'a580c4ba0d30f55546d3d181d7ea878e6a13133c' into develop

1 0

[bridgedb/develop] Rename pidExists() to processExists() in bridgedb.test.util.
by isis＠torproject.org 27 Aug '14

27 Aug '14

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/develop] Move getBridgeDBPID() from test_bridgedb.py to bridgedb.test.util.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit c9db4818c890429e699f81723ca98c663388ec0f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:18:06 2014 +0000 Move getBridgeDBPID() from test_bridgedb.py to bridgedb.test.util. --- lib/bridgedb/test/test_bridgedb.py | 25 ++----------------------- lib/bridgedb/test/util.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 0d53fef..8627aed 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -21,6 +21,7 @@ from twisted.trial import unittest from twisted.trial.unittest import SkipTest from bridgedb.test.util import pidExists +from bridgedb.test.util import getBridgeDBPID class BridgeDBCliTest(unittest.TestCase): @@ -31,31 +32,9 @@ class BridgeDBCliTest(unittest.TestCase): topdir = here.rstrip('_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') - self.pid = self.getBridgeDBPID(self.pidfile) + self.pid = getBridgeDBPID(self.pidfile) self.assignmentsFile = os.path.join(self.rundir, 'assignments.log') - def getBridgeDBPID(self, pidfile="bridgedb.pid"): - """Read the ``bridgedb.pid`` file in **rundir**, if it exists, to get - the PID. - - :param str pidfile: The path to the BridgeDB pidfile. - :rtype: int - :returns: The process ID, if available, otherwise ``0``. - """ - fh = None - try: - fh = open(pidfile) - except (IOError, OSError) as err: - print(err) - pid = 0 - else: - pid = int(fh.read()) - - if fh: - fh.close() - - return pid - def doSleep(self): """Sleep for some ammount of time. diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 1067526..287fa26 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -87,6 +87,28 @@ def pidExists(pid): else: return True +def getBridgeDBPID(pidfile="bridgedb.pid"): + """Read the ``bridgedb.pid`` file in **rundir**, if it exists, to get the + PID. + + :param str pidfile: The path to the BridgeDB pidfile. + :rtype: int + :returns: The process ID, if available, otherwise ``0``. + """ + fh = None + try: + fh = open(pidfile) + except (IOError, OSError) as err: + print(err) + pid = 0 + else: + pid = int(fh.read()) + + if fh: + fh.close() + + return pid + #: Mixin class for use with :api:`~twisted.trial.unittest.TestCase`. A #: ``TestCaseMixin`` can be used to add additional methods, which should be

1 0

[bridgedb/develop] Only run test_https.py tests if a BridgeDB process is already running.
by isis＠torproject.org 27 Aug '14

27 Aug '14

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/develop] Use processExists() to decide SkipTest in test_bridgedb.py.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit c8b6c0dc15ad951f8d8d89608f67e1e619b1ab44 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:33:01 2014 +0000 Use processExists() to decide SkipTest in test_bridgedb.py. --- lib/bridgedb/test/test_bridgedb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 750ddd4..b5a7159 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -59,7 +59,7 @@ class BridgeDBCliTest(unittest.TestCase): This test ensures that an ``assignments.log`` file is created after a BridgeDB process was started. """ - if not self.pid: + if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.") self.assertTrue(os.path.isfile(self.assignmentsFile)) @@ -68,7 +68,7 @@ class BridgeDBCliTest(unittest.TestCase): """Test that BridgeDB creates a new ``assignments.log`` file after receiving a SIGHUP. """ - if not self.pid: + if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.") os.unlink(self.assignmentsFile) @@ -78,7 +78,7 @@ class BridgeDBCliTest(unittest.TestCase): def test_bridgedb_SIGUSR1_buckets(self): """Test that BridgeDB dumps buckets appropriately after a SIGUSR1.""" - if not self.pid: + if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.") os.kill(self.pid, signal.SIGUSR1)

1 0

[bridgedb/develop] Document parameter in bridgedb.test.util.processExists().
by isis＠torproject.org 27 Aug '14

27 Aug '14

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/develop] PEP8 OCD import rearrangements in test_https.py.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 2e14f042174c0de3d256b8dbfe13b587574a4dac Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:43:40 2014 +0000 PEP8 OCD import rearrangements in test_https.py. --- lib/bridgedb/test/test_https.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 176b769..95c2be8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -23,11 +23,13 @@ repository. """ from __future__ import print_function -from twisted.trial import unittest -from BeautifulSoup import BeautifulSoup + import mechanize import os +from BeautifulSoup import BeautifulSoup +from twisted.trial import unittest + from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID

1 0

[bridgedb/develop] PEP8 OCD import rearrangements in test_smtp.py.
by isis＠torproject.org 27 Aug '14

27 Aug '14

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

[bridgedb/develop] Only run test_smtp.py tests if a BridgeDB process is already running.
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit e4db0215f3282a6d53ba001ef6f75af648cdebbb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:45:41 2014 +0000 Only run test_smtp.py tests if a BridgeDB process is already running. --- lib/bridgedb/test/test_smtp.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index fb25c46..51d08f5 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -9,6 +9,12 @@ import asyncore import threading import Queue import random +import os + +from twisted.trial.unittest import SkipTest + +from bridgedb.test.util import processExists +from bridgedb.test.util import getBridgeDBPID # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange @@ -109,6 +115,11 @@ class SMTPTests(unittest.TestCase): '''Called at the start of each test, ensures that the SMTP server is running. ''' + 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.server = EmailServer.startServer() def tearDown(self): @@ -117,6 +128,9 @@ class SMTPTests(unittest.TestCase): self.server.stop() def test_getBridges(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + # send the mail to bridgedb, choosing a random email address sendMail(fromAddress=FROM_ADDRESS_TEMPLATE % random.randint(MIN_FROM_ADDRESS, MAX_FROM_ADDRESS)) @@ -126,6 +140,9 @@ class SMTPTests(unittest.TestCase): self.server.getAndCheckMessageContains("Here are your bridges") def test_getBridges_rateLimitExceeded(self): + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + # send the mail to bridgedb, choosing a random email address FROM_ADDRESS = FROM_ADDRESS_TEMPLATE % random.randint( MIN_FROM_ADDRESS, MAX_FROM_ADDRESS) @@ -152,6 +169,9 @@ class SMTPTests(unittest.TestCase): '''Sends a large number of emails in a short period of time, and checks that a response is received for each message. ''' + if not self.pid or not processExists(self.pid): + raise SkipTest("Can't run test: no BridgeDB process running.") + NUM_MAILS = 100 for i in range(NUM_MAILS): # Note: if by chance two emails with the same FROM_ADDRESS are

1 0

[bridgedb/develop] Merge branch 'fix/9874-https' into develop
by isis＠torproject.org 27 Aug '14

27 Aug '14

commit 25e092708ca0a50399cbd06d67c63cf46f145d3d Merge: f5360f5 2e14f04 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 05:46:45 2014 +0000 Merge branch 'fix/9874-https' into develop lib/bridgedb/test/test_https.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)

1 0