April 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Disabled test_pushFilenameStack, because it's failing in travis
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 2c80cebaa2f2e1421756e123e3922163cc85e765 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 18:19:36 2013 +0200 Disabled test_pushFilenameStack, because it's failing in travis --- ooni/tests/disabled_test_utils.py | 21 +++++++++++++++++++++ ooni/tests/test_utils.py | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ooni/tests/disabled_test_utils.py b/ooni/tests/disabled_test_utils.py new file mode 100644 index 0000000..cafb00f --- /dev/null +++ b/ooni/tests/disabled_test_utils.py @@ -0,0 +1,21 @@ +import os +import unittest +from ooni.utils import pushFilenameStack +basefilename = os.path.abspath('dummyfile') +class TestUtils(unittest.TestCase): + def test_pushFilenameStack(self): + f = open(basefilename, "w+") + f.write("0\n") + f.close() + for i in xrange(1, 5): + f = open(basefilename+".%s" % i, "w+") + f.write("%s\n" % i) + f.close() + + pushFilenameStack(basefilename) + for i in xrange(1, 5): + f = open(basefilename+".%s" % i) + c = f.readlines()[0].strip() + self.assertEqual(str(i-1), str(c)) + f.close() + diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py deleted file mode 100644 index cafb00f..0000000 --- a/ooni/tests/test_utils.py +++ /dev/null @@ -1,21 +0,0 @@ -import os -import unittest -from ooni.utils import pushFilenameStack -basefilename = os.path.abspath('dummyfile') -class TestUtils(unittest.TestCase): - def test_pushFilenameStack(self): - f = open(basefilename, "w+") - f.write("0\n") - f.close() - for i in xrange(1, 5): - f = open(basefilename+".%s" % i, "w+") - f.write("%s\n" % i) - f.close() - - pushFilenameStack(basefilename) - for i in xrange(1, 5): - f = open(basefilename+".%s" % i) - c = f.readlines()[0].strip() - self.assertEqual(str(i-1), str(c)) - f.close() -

1 0

[ooni-probe/master] Fix travis file
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 321543793b6a81bf90d4f79a965ce29bf02ce89d Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 17:29:44 2013 +0200 Fix travis file --- .travis.yml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c89f6d..2dc900f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: python before_install: - - sudo apt-get install tor + - sudo apt-get install tor python-pyrex python: - - "3.3" - "2.7" - "2.6" # command to install dependencies @@ -16,4 +15,4 @@ script: # - trial ooni - cp ooniprobe.conf.sample ooniprobe.conf - sh scripts/before_i_commit.sh - - bin/ooniprobe nettest/blocking/tcpconnect.py -f example_inputs/alexa-top-1k.txt \ No newline at end of file + - bin/ooniprobe nettest/blocking/tcpconnect.py -f example_inputs/alexa-top-1k.txt

1 0

[ooni-probe/master] Only run trial unittests
by art＠torproject.org 30 Apr '13

30 Apr '13

commit a42421fefd213f49a9dc54e7bfae28bf6b4494d8 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 18:11:23 2013 +0200 Only run trial unittests --- .travis.yml | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2845bdf..8a3f99c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,3 @@ script: # To be activated after merge of PR#64 - cp ooniprobe.conf.sample ooniprobe.conf - trial ooni - - sh scripts/before_i_commit.sh - - bin/ooniprobe nettest/blocking/tcpconnect.py -f example_inputs/alexa-top-1k.txt

1 0

[ooni-probe/master] Install pyrex and python deps via pip
by art＠torproject.org 30 Apr '13

30 Apr '13

commit c3665b2ab816f0160cf5e391a44f020cc876d5a5 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 17:43:20 2013 +0200 Install pyrex and python deps via pip --- .travis.yml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1631ae5..78cf20e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: python before_install: - - sudo apt-get install tor python-pyrex + - sudo apt-get install tor python: - "2.7" - "2.6" # command to install dependencies # the first is for testing pip and the second for setuptools install: - #- pip install -r requirements.txt --use-mirrors + - pip install pyrex + - pip install -r requirements.txt --use-mirrors - python setup.py install # command to run tests, e.g. python setup.py test script:

1 0

[ooni-probe/master] Fix typo in ooniprobe sample config file
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 1c24514e6418fb47307249734bfd7b6e23f766aa Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 17:57:35 2013 +0200 Fix typo in ooniprobe sample config file --- ooniprobe.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index ab01583..27a4fb3 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -38,7 +38,7 @@ advanced: # After how many retries we should give up on a measurement measurement_retries: 2 # How many measurments to perform concurrently - measurement_concurrency = 100 + measurement_concurrency: 100 # After how may seconds we should give up reporting reporting_timeout: 30 # After how many retries to give up on reporting

1 0

[ooni-probe/master] Add libpcap-dev to dependencies
by art＠torproject.org 30 Apr '13

30 Apr '13

commit d409e2ec21c6433e166a66b6f3620cb9ce3a9a6a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 22 17:50:42 2013 +0200 Add libpcap-dev to dependencies --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78cf20e..2845bdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python before_install: - - sudo apt-get install tor + - sudo apt-get install tor libpcap-dev python: - "2.7" - "2.6"

1 0

[ooni-probe/master] Add fabfile for updating of ooniprobe docs on ooni.tpo
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 4a27bdbd4a2e306c013c0d8326b6e15aa8d5b4eb Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 31 13:41:12 2013 +0100 Add fabfile for updating of ooniprobe docs on ooni.tpo --- docs/fabfile.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/docs/fabfile.py b/docs/fabfile.py new file mode 100644 index 0000000..d0461fd --- /dev/null +++ b/docs/fabfile.py @@ -0,0 +1,20 @@ +import os +from fabric.api import run +from fabric.context_managers import settings +from fabric.operations import sudo, local, put + +def update_docs(): + local('make html') + build_dir = os.path.join(os.getcwd(), 'build', 'html') + put(build_dir, '/tmp') + + run("sudo -u ooni rm -rf /home/ooni/website/build/docs/") + run("sudo -u ooni cp -R /tmp/html/ /home/ooni/website/build/docs") + + run("rm -rf /tmp/html") + update_website() + +def update_website(): + run("sudo -u mirroradm /usr/local/bin/static-master-update-component ooni.torproject.org") + +

1 0

[ooni-probe/master] Use ssh config file
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 7f8f366d556cac02e7d92baddc019286cc789b25 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 2 16:47:45 2013 +0100 Use ssh config file --- docs/fabfile.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/fabfile.py b/docs/fabfile.py index d0461fd..4e15993 100644 --- a/docs/fabfile.py +++ b/docs/fabfile.py @@ -1,8 +1,10 @@ import os -from fabric.api import run +from fabric.api import run, env from fabric.context_managers import settings from fabric.operations import sudo, local, put +env.use_ssh_config = True + def update_docs(): local('make html') build_dir = os.path.join(os.getcwd(), 'build', 'html')

1 0

[ooni-probe/master] Update README.md
by art＠torproject.org 30 Apr '13

30 Apr '13

commit cb12b185c5c01f891109282ed75b87a6ba842c5a Author: samsmith <github.com(a)msmith.net> Date: Mon Mar 4 16:01:07 2013 +0000 Update README.md tcpdump seems to be required on a clean debian (6.0.7) install. (this change may also need making in other places) --- README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README.md b/README.md index 13102d3..b49a69b 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Basic system requirements: On Debian or Ubuntu GNU/Linux based systems these can be installed with: - sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb + sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump Other packages that may be of interest:

1 0

[ooni-probe/master] Fix #8329, txscapy.PcapDummyWriter.write() has wrong signature method.
by art＠torproject.org 30 Apr '13

30 Apr '13

commit b203c2e26985aa22bd8179da01fbdb642a12fc11 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 24 22:45:12 2013 +0000 Fix #8329, txscapy.PcapDummyWriter.write() has wrong signature method. --- ooni/utils/txscapy.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 87c0b4a..a6cacb1 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -64,6 +64,7 @@ else: def __init__(self, pcap_filename, *arg, **kw): log.err("Initializing DummyPcapWriter. We will not actually write to a pcapfile") + @staticmethod def write(self): pass

1 0