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

[bridgedb/master] Remove print() calls from test_https.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 68bfbcdc899b5c5fbfd9e97e4b36a5a7402939f9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 21 02:34:07 2014 +0000 Remove print() calls from test_https.py. --- lib/bridgedb/test/test_https.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index cb4a53d..f06f6d3 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -48,8 +48,6 @@ class HTTPTests(unittest.TestCase): self.assertTrue(self.br.viewing_html()) self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) self.assertEquals(self.br.title(), "BridgeDB") - #for link in self.br.links(): print(link) - #for form in self.br.forms(): print(form) return self.br def goToOptionsPage(self): @@ -64,8 +62,6 @@ class HTTPTests(unittest.TestCase): # ------------- Options self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) return self.br def submitOptions(self, transport, ipv6, captchaResponse): @@ -81,7 +77,6 @@ class HTTPTests(unittest.TestCase): self.br.select_form(nr=0) # change the pluggable transport to something else - #print(self.br.form) self.br.form['transport'] = [transport] if ipv6: self.br.form['ipv6'] = ['yes'] @@ -92,8 +87,6 @@ class HTTPTests(unittest.TestCase): if ipv6: EXPECTED_URL += "&ipv6=yes" self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) # As on the previous page, the form does not define a 'name' attribute, forcing # us to use the index of the form i.e. 0 @@ -103,7 +96,6 @@ class HTTPTests(unittest.TestCase): # input the required captcha response. There is only one captcha defined # by default, so this should always be accepted. Note this will not be possible # to automate if used with a real captcha systems (e.g. reCAPTCHA) - #self.br.form['captcha_response_field'] = 'Tvx74PMy' self.br.form['captcha_response_field'] = captchaResponse captcha_response = self.br.submit() @@ -111,7 +103,6 @@ class HTTPTests(unittest.TestCase): # URL should be the same as last time self.assertEquals(self.br.response().geturl(), EXPECTED_URL) soup = BeautifulSoup(captcha_response.read()) - #print soup.prettify() return soup def getBridgeLinesFromSoup(self, soup, fieldsPerBridge): @@ -127,7 +118,6 @@ class HTTPTests(unittest.TestCase): bridge_lines = portion.text.strip().split('\n') for bridge_line in bridge_lines: fields = bridge_line.split() - print("\nFields in bridge line: %s" % fields) bridges.append(fields) self.assertTrue(len(bridges) > 0, "Found no bridge lines in %s" % soup)

1 0

[bridgedb/master] Fix old-style classes in bridgedb.Bucket.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit eecabb0e5054ad619fa8591bfc067cc38ed04cc5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 05:43:12 2014 +0000 Fix old-style classes in bridgedb.Bucket. --- lib/bridgedb/Bucket.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index fcc3794..b5054ac 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -37,7 +37,7 @@ toHex = binascii.b2a_hex # distinguish them from real distributors? PSEUDO_DISTRI_PREFIX = "pseudo_" -class BucketData: +class BucketData(object): """A file bucket value class. name - Name of the bucket (From config), prefixed by pseudo distributor prefix @@ -52,7 +52,7 @@ class BucketData: self.needed = int(needed) self.allocated = 0 -class BucketManager: +class BucketManager(object): """BucketManager reads a number of file bucket identifiers from the config. They're expected to be in the following format:

1 0

[bridgedb/master] Increase sleep time in test_bridgedb.py tests for non-CI machines.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit d131f15a98573dd37619b6bb7895e09589e223b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 21:20:37 2014 +0000 Increase sleep time in test_bridgedb.py tests for non-CI machines. --- lib/bridgedb/test/test_bridgedb.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index e54d324..0d53fef 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -56,6 +56,19 @@ class BridgeDBCliTest(unittest.TestCase): return pid + def doSleep(self): + """Sleep for some ammount of time. + + We usually have less fake bridge descriptors with CI runs than we do + during other tests, so we can safely decrease the sleep time on CI + machines. + """ + if os.environ.get("TRAVIS"): + time.sleep(5) + else: + time.sleep(20) + return + def test_bridgedb_assignments_log(self): """This test should only be run if a BridgeDB server has already been started in another process. @@ -81,7 +94,7 @@ class BridgeDBCliTest(unittest.TestCase): os.unlink(self.assignmentsFile) os.kill(self.pid, signal.SIGHUP) - time.sleep(5) + self.doSleep() self.assertTrue(os.path.isfile(self.assignmentsFile)) def test_bridgedb_SIGUSR1_buckets(self): @@ -90,7 +103,7 @@ class BridgeDBCliTest(unittest.TestCase): raise SkipTest("Can't run test: no BridgeDB process running.") os.kill(self.pid, signal.SIGUSR1) - time.sleep(5) + self.doSleep() buckets = [['email', False], ['https', False], ['unallocated', False]] for rundirfile in os.listdir(self.rundir): for bucket in buckets:

1 0

[bridgedb/master] Disable COLLECT_TIMESTAMPS for CI integration test runs.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 41d6236f3138cb73723ccfc9d1b7aea5856b5255 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 22:06:21 2014 +0000 Disable COLLECT_TIMESTAMPS for CI integration test runs. --- bridgedb.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb.conf b/bridgedb.conf index 651d4a1..a1d6c59 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -167,7 +167,7 @@ LOG_TIME_FORMAT = "%H:%M:%S" # (boolean) If True, then collect, sort, and store all timestamps seen for all # bridges. This operation is extremely expensive, and should be disabled when # it is not necessary. -COLLECT_TIMESTAMPS = True +COLLECT_TIMESTAMPS = False #------------------------------- # General Distribution Options \

1 0

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

03 Feb '15

commit 2f0ea18d2379fc8b67071adc37d9412c8eb77ced Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 05:56:35 2014 +0000 Fix another typo in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index cff8cb8..2912ae1 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -33,7 +33,7 @@ class BucketDataTest(unittest.TestCase): """Set the needed number of bridges""" needed = 10 distname = "test-distributor" - bucket = Bucket.BucketData(distname, alloc) + bucket = Bucket.BucketData(distname, needed) this(bucket.name).should.be.equal(distname) this(bucket.needed).should.be.equal(needed) @@ -41,7 +41,7 @@ class BucketDataTest(unittest.TestCase): """Set the needed number of bridges to the default""" needed = '*' distname = "test-distributor" - bucket = Bucket.BucketData(distname, alloc) + bucket = Bucket.BucketData(distname, needed) this(bucket.name).should.be.equal(distname) this(bucket.needed).should.be.equal(needed)

1 0

[bridgedb/master] PEP8 fix several line-too-long problems in test_https.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit ee8b578e1bbdf7f00dc6342d433b26fd46c7ed7d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 21 02:38:29 2014 +0000 PEP8 fix several line-too-long problems in test_https.py. --- lib/bridgedb/test/test_https.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 657f516..35952a5 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -41,7 +41,8 @@ class HTTPTests(unittest.TestCase): def openBrowser(self): # use mechanize to open the BridgeDB website in its browser self.br = mechanize.Browser() - self.br.set_handle_robots(False) # prevents 'HTTP Error 403: request disallowed by robots.txt' + # prevents 'HTTP Error 403: request disallowed by robots.txt' + self.br.set_handle_robots(False) self.br.open(HTTPS_ROOT) # -------------- Home/Root page @@ -88,14 +89,15 @@ class HTTPTests(unittest.TestCase): EXPECTED_URL += "&ipv6=yes" self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - # As on the previous page, the form does not define a 'name' attribute, forcing - # us to use the index of the form i.e. 0 + # As on the previous page, the form does not define a 'name' + # attribute, forcing us to use the index of the form, i.e. 0 #self.br.select_form(name="captchaSubmission") self.br.select_form(nr=0) - # input the required captcha response. There is only one captcha defined - # by default, so this should always be accepted. Note this will not be possible - # to automate if used with a real captcha systems (e.g. reCAPTCHA) + # input the required captcha response. There is only one captcha + # defined by default, so this should always be accepted. Note this + # will not be possible to automate if used with a third-party CAPTCHA + # systems (e.g. reCAPTCHA) self.br.form['captcha_response_field'] = captchaResponse captcha_response = self.br.submit() @@ -134,8 +136,8 @@ class HTTPTests(unittest.TestCase): self.goToOptionsPage() PT = 'obfs2' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for bridge in bridges: pt = bridge[0] @@ -146,7 +148,8 @@ class HTTPTests(unittest.TestCase): self.goToOptionsPage() PT = 'obfs3' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for bridge in bridges: pt = bridge[0] @@ -157,8 +160,8 @@ class HTTPTests(unittest.TestCase): self.goToOptionsPage() PT = '0' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) for bridge in bridges: # TODO: do more interesting checks @@ -169,11 +172,12 @@ class HTTPTests(unittest.TestCase): self.goToOptionsPage() PT = 'scramblesuit' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - + soup = self.submitOptions(transport=PT, ipv6=False, + captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) for bridge in bridges: pt = bridge[0] password = bridge[-1] self.assertEquals(PT, pt) - self.assertTrue(password.find("password=") != -1, "Password field missing expected text") + self.assertTrue(password.find("password=") != -1, + "Password field missing expected text")

1 0

[bridgedb/master] Be more careful about how we split bridge lines in test_https.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit bd590d73dea233d82364745ae282f386ed670c6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 20 07:45:54 2014 +0000 Be more careful about how we split bridge lines in test_https.py. This is done to ensure that if we don't get the bridges.html page in response (i.e. if the CAPTCHA solution was wrong, or something is just plain wrong with the webserver that is supposed to be running in the background), that the BeautifulSoup HTML tag handling in test_https.py will be a bit more robust. --- lib/bridgedb/test/test_https.py | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 40ab865..cb4a53d 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -121,12 +121,21 @@ class HTTPTests(unittest.TestCase): # </div> bridges = [] soup = soup.findAll(attrs={'class' : 'bridge-lines'}) - bridge_lines = [line.text.split('\n') for line in soup] - self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") - for bridge_line in bridge_lines: - items = bridge_line.split(' ') - self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) - bridges.append(items) + self.assertTrue(soup, "Could not find <div class='bridge-lines'>!") + + for portion in soup: + bridge_lines = portion.text.strip().split('\n') + for bridge_line in bridge_lines: + fields = bridge_line.split() + print("\nFields in bridge line: %s" % fields) + bridges.append(fields) + + self.assertTrue(len(bridges) > 0, "Found no bridge lines in %s" % soup) + + for bridge in bridges: + self.assertEquals(len(bridge), fieldsPerBridge, + "Expected %d fields in bridge line %s" + % (fieldsPerBridge, bridge)) return bridges def test_get_obfs2_ipv4(self): @@ -137,7 +146,8 @@ class HTTPTests(unittest.TestCase): soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) - for pt, bridge, fingerprint in bridges: + for bridge in bridges: + pt = bridge[0] self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): @@ -146,9 +156,9 @@ class HTTPTests(unittest.TestCase): PT = 'obfs3' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) - for pt, bridge, fingerprint in bridges: + for bridge in bridges: + pt = bridge[0] self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): @@ -159,7 +169,7 @@ class HTTPTests(unittest.TestCase): soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) - for bridge, fingerprint in bridges: + for bridge in bridges: # TODO: do more interesting checks self.assertTrue(bridge != None) @@ -171,8 +181,8 @@ class HTTPTests(unittest.TestCase): soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) - for pt, bridge, fingerprint, password in bridges: + for bridge in bridges: + pt = bridge[0] + password = bridge[-1] self.assertEquals(PT, pt) self.assertTrue(password.find("password=") != -1, "Password field missing expected text") - -

1 0

[bridgedb/master] Raise time interval between sending process signals on TRAVIS machines.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit b4f20ebeb5c2796e93c01c35b63c65d0959f045d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 06:21:08 2014 +0000 Raise time interval between sending process signals on TRAVIS machines. There have been intermittent CI failures due to the test_bridgedb.BridgeDBCliTest.test_bridgedb_SIGHUP_assignments_log test sometimes not finding an assignments.log file. Presumedly, this is because we aren't waiting long enough. --- lib/bridgedb/test/test_bridgedb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index b5a7159..7324464 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -43,7 +43,7 @@ class BridgeDBCliTest(unittest.TestCase): machines. """ if os.environ.get("TRAVIS"): - time.sleep(5) + time.sleep(10) else: time.sleep(20) return

1 0

[bridgedb/master] Use processExists() to decide SkipTest in test_bridgedb.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

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/master] Move getBridgeDBPID() from test_bridgedb.py to bridgedb.test.util.
by isis＠torproject.org 03 Feb '15

03 Feb '15

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