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

[webwml/master] make the specblob tag be more right
by arma＠torproject.org 11 Feb '15

11 Feb '15

commit 39fb3c52a47d4178ecc521a7fa0ca1f83044f07e Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 10 20:16:26 2015 -0500 make the specblob tag be more right it'd be great if somebody would go through the other gitweb tags and change them to be correct with our new gitweb --- include/links.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/links.wmi b/include/links.wmi index 31d3032..3879652 100644 --- a/include/links.wmi +++ b/include/links.wmi @@ -10,7 +10,7 @@ <define-tag wikifaq whitespace=delete>https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ</define-tag> <define-tag blog whitespace=delete>https://blog.torproject.org/blog/</define-tag> <define-tag tbbrepo whitespace=delete>https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:</define-tag> -<define-tag specblob whitespace=delete>https://gitweb.torproject.org/torspec.git?a=blob_plain;hb=HEAD;f=</define-tag> +<define-tag specblob whitespace=delete>https://gitweb.torproject.org/torspec.git/tree/</define-tag> <define-tag spectree whitespace=delete>https://gitweb.torproject.org/torspec.git?a=tree;hb=HEAD;f=</define-tag> <define-tag doxygen whitespace=delete>https://doxygen.torproject.org/</define-tag>

1 0

[bridgedb/develop] Merge branch 'fix/4405-tor-exit-check_2_r1' into develop
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 5a950766a3dd1786132de486748da7e30b57d0b2 Merge: 177edfd 645058e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 08:29:53 2015 +0000 Merge branch 'fix/4405-tor-exit-check_2_r1' into develop lib/bridgedb/Main.py | 16 ---------------- lib/bridgedb/proxy.py | 1 + 2 files changed, 1 insertion(+), 16 deletions(-)

1 0

[bridgedb/develop] Fix Travis-CI build issue with group-writable PYTHON_EGG_CACHE dir.
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit cbc3e2d0e110107b5c064cfd8b54ecbfafc80265 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:14:02 2015 +0000 Fix Travis-CI build issue with group-writable PYTHON_EGG_CACHE dir. Travis-CI issue #1748 [0] was causing non-deterministic CI test failures, particularly in the lib/bridgedb/test/test_https.py integration tests which use the Python mechanize module to test the HTTPS server. [0] This is a known Python security issue, particularly for WSGI server setup. [2] [3] The fix is quite simple, just set the PYTHON_EGG_CACHE environment variable to something unique to each CI build and ensure that the PYTHON_EGG_CACHE directory exists. * FIXES issues with non-deterministic Travis-CI test failures due to a known security hole in shared Python .egg cache directories. [0]: https://github.com/travis-ci/travis-ci/issues/1748 [1]: https://travis-ci.org/isislovecruft/bridgedb/jobs/50169439#L1763 [2]: https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-py… [3]: https://github.com/pypa/virtualenv/issues/459 --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 412622b..7e4f6f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,15 @@ addons: - bridges.torproject.org env: + global: + # Fixes Travis-CI issue #1748, which was causing non-deterministic CI test failures, + # particularly in the lib/bridgedb/test/test_https.py integration tests which use + # the Python mechanize module to test the HTTPS server. + # See https://github.com/travis-ci/travis-ci/issues/1748 + # https://travis-ci.org/isislovecruft/bridgedb/jobs/50169439#L1763 + # https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-py… + # https://github.com/pypa/virtualenv/issues/459 + - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1 @@ -39,6 +48,7 @@ matrix: before_install: - sudo apt-get update + - mkdir $PYTHON_EGG_CACHE install: - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools

1 0

[bridgedb/develop] Update Travis-CI matrix variable TWISTED_VERSION to 14.0.2.
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit d478a4166497303b28c60000e4fb3374743ae6c5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:20:47 2015 +0000 Update Travis-CI matrix variable TWISTED_VERSION to 14.0.2. This is currently the next version of Twisted available in Debian Jessie. * UPDATE .travis.yml TWISTED_VERSION from 14.0.0 to 14.0.2. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e4f6f2..df8b54f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ env: matrix: include: - python: "2.7" - env: TWISTED_VERSION=14.0.0 PYOPENSSL_VERSION=0.14 + env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 allow_failures: - python: "pypy" fast_finish: true

1 0

[bridgedb/develop] Add Travis-CI matrix element for Twisted-15.0.0 and allow failures.
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 4dccceed2feaadc86296598e16c9ce04ad5c8b4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:23:16 2015 +0000 Add Travis-CI matrix element for Twisted-15.0.0 and allow failures. We'll now test for the very latest and greatest Twisted, but we don't care if tests run on Twisted-15.0.0 fail. Twisted-15.0.0 isn't included yet in any Debian distribution channel. --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df8b54f..9da619d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ notifications: python: - "2.7" - - "pypy" addons: hosts: @@ -36,14 +35,22 @@ env: # https://github.com/pypa/virtualenv/issues/459 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: + # Debian Wheezy - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1 + # Debian Jessie + - TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 matrix: include: - python: "2.7" + env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14 + - python: "pypy" env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 allow_failures: + - python: "2.7" + env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14 - python: "pypy" + env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 fast_finish: true before_install:

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 2c9ef89e6778b3c37bb2140ab4e111ed0c587186 Merge: 5a95076 cbc3e2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:50:22 2015 +0000 Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-travis-matrix-update' into develop
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit a36e627157d873aa2c9659cea0c9e863c50a0f52 Merge: 2c9ef89 4dcccee Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 23:04:20 2015 +0000 Merge branch 'hotfix/0.2.4-travis-matrix-update' into develop .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Fix DirtyReactorAggregateError in test_proxy_downloadTorExits().
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 9c33a595c131d439bd943567df794da48e116dab Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:34:36 2015 +0000 Fix DirtyReactorAggregateError in test_proxy_downloadTorExits(). See https://travis-ci.org/isislovecruft/bridgedb/jobs/50275771#L2156 --- lib/bridgedb/test/test_proxy.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 78e24ff..144cf70 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -14,6 +14,7 @@ import sure from twisted.internet import defer +from twisted.internet import reactor from twisted.trial import unittest from bridgedb import proxy @@ -210,12 +211,22 @@ class LoadProxiesFromFileIntegrationTests(unittest.TestCase): class DownloadTorExitsTests(unittest.TestCase): """Tests for `~bridgedb.proxy.downloadTorExits()`.""" + def setUp(self): + self.protocol = MockExitListProtocol + self.proxyList = proxy.ProxySet() + + def tearDown(self): + """Cleanup method after each ``test_*`` method runs; removes all + selectable readers and writers from the reactor. + """ + reactor.removeAll() + def test_proxy_downloadTorExits(self): - proxyList = proxy.ProxySet() - d = proxy.downloadTorExits(proxyList, - 'OurIPWouldGoHere', - protocol=MockExitListProtocol) - self.assertIsInstance(d, defer.Deferred) + def do_test(): + return proxy.downloadTorExits(self.proxyList, + 'OurIPWouldGoHere', + protocol=self.protocol) + d = do_test() class ProxySetUnittests(unittest.TestCase):

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 3a11cf4110d49018eacee7ed3bff32d6e3866c58 Merge: a36e627 f46e16b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:43:33 2015 +0000 Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop .travis.yml | 1 + 1 file changed, 1 insertion(+)

1 0

[bridgedb/develop] Set permissions $PYTHON_EGG_CACHE to only be user (not group) writable.
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit f46e16b403b7c29a342019983988e6a6e7ac7366 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:41:31 2015 +0000 Set permissions $PYTHON_EGG_CACHE to only be user (not group) writable. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e4f6f2..e62551e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: before_install: - sudo apt-get update - mkdir $PYTHON_EGG_CACHE + - chmod -R og-w $PYTHON_EGG_CACHE install: - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools

1 0