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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 29 Sep '13

29 Sep '13

commit bcbab41deab8ad7b811d0b5d244e6435175773c6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 08:45:53 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 713a82e..eaf4107 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-29 08:14+0000\n" +"PO-Revision-Date: 2013-09-29 08:26+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -168,7 +168,7 @@ msgstr "Error: No se pudo establecer u obtener el UUID de su dispositivo. No se msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "" +msgstr "Error: El SHA1 de su Live CD es invalido. Puede ejecutar este programa con --noverify como argumento para omitir esta verificación." #: ../liveusb/creator.py:145 msgid "Extracting live image to USB device..." @@ -342,7 +342,7 @@ msgstr "" msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Ocurrió un problema ejecutando el siguiente instrucción: `%(command)s`.\nSe ha escrito un registro de los errores en '%(filename)s'." #: ../liveusb/dialog.py:151 msgid "" @@ -444,7 +444,7 @@ msgstr "" #: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "ISO desconosida, omitiendo verificación de checksum..." #: ../liveusb/creator.py:781 #, python-format @@ -503,11 +503,11 @@ msgstr "Verificando MD5 checksum..." #: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Verificando SHA1 checksum de la imagen del LiveCD..." #: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Verificando SHA256 checksum de la imagen del LiveCD..." #: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 29 Sep '13

29 Sep '13

commit d6b2d5f2c3ae526b5d30a9d8c438ce40fc58d4f6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 08:15:56 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 8eb6c4e..713a82e 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-28 19:17+0000\n" +"PO-Revision-Date: 2013-09-29 08:14+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -303,7 +303,7 @@ msgstr "Seleccione Live ISO" #: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." -msgstr "" +msgstr "Estableciendo los archivos de arranque OLPC..." #: ../liveusb/creator.py:711 #, python-format @@ -520,7 +520,7 @@ msgstr "Adevertencia: Toda la información de la unidad selecionada se perdera." #: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Advertencia: Crear una nueva particion borrará la existente." +msgstr "Advertencia: Crear una nueva partición borrará la existente." #: ../liveusb/gui.py:657 msgid "" @@ -549,7 +549,7 @@ msgstr "" #: ../liveusb/gui.py:755 msgid "You can try again to resume your download" -msgstr "Puede intentar de nuevo para reanudar su descarga" +msgstr "Puedes intentar de nuevo para reanudar su descarga" #: ../liveusb/creator.py:92 msgid "You must run this application as root"

1 0

[stem/master] Linking to the DocTor repository
by atagar＠torproject.org 28 Sep '13

28 Sep '13

commit ec24345427ac804640a425bbb900bf41aae3be83 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 28 16:49:25 2013 -0700 Linking to the DocTor repository Oops, our example page was still linking to my tor-utils repository rather than DocTor's. --- docs/tutorials/double_double_toil_and_trouble.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 71502d0..5f28c1b 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -29,10 +29,10 @@ something you would like to have included on this page then `let me know including system resource usage, connection information, and much more. * - .. image:: /_static/doctor.png - :target: https://gitweb.torproject.org/atagar/tor-utils.git/tree + :target: https://gitweb.torproject.org/doctor.git/tree - .. image:: /_static/label/doctor.png - :target: https://gitweb.torproject.org/atagar/tor-utils.git/tree + :target: https://gitweb.torproject.org/doctor.git/tree Monitors the Tor consensus for a variety of issues including malformed descriptors, directory authority issues, sybil attacks, and much more.

1 0

r26372: {website} Switching to https links for www.atagar.com Dreamhost just a (in website/trunk: about/en en getinvolved/en projects/en)
by Damian Johnson 28 Sep '13

28 Sep '13

Author: atagar Date: 2013-09-28 23:18:11 +0000 (Sat, 28 Sep 2013) New Revision: 26372 Modified: website/trunk/about/en/corepeople.wml website/trunk/about/en/gsoc.wml website/trunk/en/index.wml website/trunk/getinvolved/en/volunteer.wml website/trunk/projects/en/projects.wml Log: Switching to https links for www.atagar.com Dreamhost just added SSL support via SNI (Server Name Indication), no longer requiring a unique IP. As such, the only fee is the cert itself so finally adding SSL support for my site. I've added a http->https redirect, but still good to update these links... Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2013-09-27 22:31:20 UTC (rev 26371) +++ website/trunk/about/en/corepeople.wml 2013-09-28 23:18:11 UTC (rev 26372) @@ -99,7 +99,7 @@ a full Tor network simulator that he's using to help us understand and improve Tor network performance.</dd> <dt>Damian Johnson, Developer</dt> - <dd>Author of <a href="http://www.atagar.com/arm/">arm</a>, a command-line + <dd>Author of <a href="https://www.atagar.com/arm/">arm</a>, a command-line application that provides real-time status information for Tor relays and <a href="https://stem.torproject.org/">Stem</a>, a controller library for interacting with Tor.</dd> Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2013-09-27 22:31:20 UTC (rev 26371) +++ website/trunk/about/en/gsoc.wml 2013-09-28 23:18:11 UTC (rev 26372) @@ -223,7 +223,7 @@ <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li> <li><h4><a href="http://blanu.net/TorSummerOfCodeProposal.pdf">Blocking-resistant Transport Evaluation Framework</a> by Brandon Wiley</h4></li> <li><h4><a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.pdf">Metadata Anonymisation Toolkit</a> by Julien Voisin</h4></li> - <li><h4><a href="http://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li> + <li><h4><a href="https://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li> </ul> </div> Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-09-27 22:31:20 UTC (rev 26371) +++ website/trunk/en/index.wml 2013-09-28 23:18:11 UTC (rev 26372) @@ -91,9 +91,9 @@ --> <td> <div class="project"> - <a href="http://www.atagar.com/arm/"><img + <a href="https://www.atagar.com/arm/"><img src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a> - <h3><a href="http://www.atagar.com/arm/">Arm</a></h3> + <h3><a href="https://www.atagar.com/arm/">Arm</a></h3> <p>Terminal (command line) application for monitoring and configuring Tor.</p> </div> Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-09-27 22:31:20 UTC (rev 26371) +++ website/trunk/getinvolved/en/volunteer.wml 2013-09-28 23:18:11 UTC (rev 26372) @@ -477,7 +477,7 @@ </p> <a id="project-arm"></a> - <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a + <h3><a href="https://www.atagar.com/arm/">Arm</a> (<a href="https://gitweb.torproject.org/arm.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -1083,7 +1083,7 @@ href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt">control protocol</a> to help developers program against the tor process, enabling them to build things similar to <a href="#project-vidalia">Vidalia</a> and - <a href="http://www.atagar.com/arm/">arm</a>. + <a href="https://www.atagar.com/arm/">arm</a>. </p> <p> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2013-09-27 22:31:20 UTC (rev 26371) +++ website/trunk/projects/en/projects.wml 2013-09-28 23:18:11 UTC (rev 26372) @@ -24,7 +24,7 @@ </div></div> <div class="projectbox"> -<a href="http://www.atagar.com/arm/"><img class="icon" +<a href="https://www.atagar.com/arm/"><img class="icon" src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a> <div class="projectdesc"><div class="name"><a href="<page projects/arm>">Arm</a></div> <p>Arm is a terminal status monitor for Tor,

1 0

[ooni-probe/master] Merge pull request #209 from TheTorProject/fix/do_not_swallow_failures_in_http_requests
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 3da8ab09b0efabda316271f1994e9bad53b58c63 Merge: 8c35220 3d2b902 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Sep 28 13:21:43 2013 -0700 Merge pull request #209 from TheTorProject/fix/do_not_swallow_failures_in_http_requests Do not swallow failures in http_requests ooni/nettests/blocking/http_requests.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)

1 0

[ooni-probe/master] Fix ambiguity in what a ReportEntryTask does
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 12fd780b9f00b2c016db8cda8fe24f8a5d1cd007 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 18 13:41:48 2013 +0200 Fix ambiguity in what a ReportEntryTask does ReportEntryTask can be passed dicts, Measurements, or Failures --- ooni/reporter.py | 16 ++++++++++++---- ooni/tasks.py | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index b5fcce8..72c6975 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -19,7 +19,7 @@ from twisted.internet.error import ConnectionRefusedError from twisted.python.failure import Failure from ooni.utils import log - +from ooni.tasks import Measurement try: from scapy.packet import Packet except ImportError: @@ -202,9 +202,11 @@ class YAMLReporter(OReporter): def writeReportEntry(self, entry): log.debug("Writing report with YAML reporter") self._write('---\n') - if isinstance(entry, Failure): + if isinstance(entry, Measurement): + self._write(safe_dump(entry.testInstance.report)) + elif isinstance(entry, Failure): self._write(entry.value) - else: + elif isinstance(entry, dict): self._write(safe_dump(entry)) self._write('...\n') @@ -255,7 +257,12 @@ class OONIBReporter(OReporter): def writeReportEntry(self, entry): log.debug("Writing report with OONIB reporter") content = '---\n' - content += safe_dump(entry) + if isinstance(entry, Measurement): + content += safe_dump(entry.testInstance.report) + elif isinstance(entry, Failure): + content += entry.value + elif isinstance(entry, dict): + content += safe_dump(entry) content += '...\n' url = self.collectorAddress + '/report' @@ -444,6 +451,7 @@ class Report(object): a deferred that will fire once all the report entries have been written or errbacks when no more reporters """ + all_written = defer.Deferred() report_tracker = ReportTracker(self.reporters) diff --git a/ooni/tasks.py b/ooni/tasks.py index baefb51..3007a11 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -154,13 +154,13 @@ class ReportTracker(object): self.report_completed += 1 class ReportEntry(TaskWithTimeout): - def __init__(self, reporter, measurement): + def __init__(self, reporter, entry): self.reporter = reporter - self.measurement = measurement + self.entry = entry if config.advanced.reporting_timeout: self.timeout = config.advanced.reporting_timeout TaskWithTimeout.__init__(self) def run(self): - return self.reporter.writeReportEntry(self.measurement) + return self.reporter.writeReportEntry(self.entry)

1 0

[ooni-probe/master] Make the director pass Measurements to the report
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 0226bdb130827511f1ec7347a2c1e9d1281ff53a Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 18 13:44:31 2013 +0200 Make the director pass Measurements to the report Simply passing a failure instance does not provide any contextual information, such as the input that was used, or headers. Instead, we should always write the report object, even in case of failure, and NetTests should try to add useful information to the report in their errbacks. --- ooni/director.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 50323fd..628b812 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -178,7 +178,7 @@ class Director(object): log.msg("Successfully completed measurement: %s" % measurement) self.totalMeasurementRuntime += measurement.runtime self.successfulMeasurements += 1 - return measurement.testInstance.report + return measurement def measurementFailed(self, failure, measurement): log.msg("Failed doing measurement: %s" % measurement) @@ -186,7 +186,7 @@ class Director(object): self.failedMeasurements += 1 self.failures.append((failure, measurement)) - return failure + return measurement def reporterFailed(self, failure, net_test): """

1 0

[ooni-probe/master] Merge pull request #210 from TheTorProject/fix/reportWriteEntry
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 3062eb23103bc5586f853f8ce2891af38f971244 Merge: 3da8ab0 0226bdb Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Sep 28 13:26:37 2013 -0700 Merge pull request #210 from TheTorProject/fix/reportWriteEntry Fix/report write entry ooni/director.py | 4 ++-- ooni/reporter.py | 16 ++++++++++++---- ooni/tasks.py | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-)

1 0

[ooni-probe/master] Do not swallow failures in http_requests
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 3d2b9025ca372ca0fcdb88ce6e2cb050c1cf6e64 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 18 12:09:46 2013 +0200 Do not swallow failures in http_requests The callback attached to the deferredList previously swallowed failures, such that any errors would never reach the errbacks attached and therefore the test would not get rescheduled. --- ooni/nettests/blocking/http_requests.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ooni/nettests/blocking/http_requests.py b/ooni/nettests/blocking/http_requests.py index 8c74762..4e7d582 100644 --- a/ooni/nettests/blocking/http_requests.py +++ b/ooni/nettests/blocking/http_requests.py @@ -102,12 +102,19 @@ class HTTPRequestsTest(httpt.HTTPTest): self.compare_headers(control_result.headers, experiment_result.headers) - - if not control_succeeded: - self.report['control_failure'] = failureToString(control_result) - - if not experiment_succeeded: - self.report['experiment_failure'] = failureToString(experiment_result) + else: + if not control_succeeded: + self.report['control_failure'] = failureToString(control_result) + + if not experiment_succeeded: + self.report['experiment_failure'] = failureToString(experiment_result) + # Now return some kind of failure so we can retry + # However, it would be ideal to split this test into two methods + # and compare the results in the postProcessor + # Sadly the postProcessor API is currently not implemented + if control_succeeded: + return experiment_result + return control_result headers = {'User-Agent': [random.choice(userAgents)]}

1 0

[ooni-probe/master] Update documentation and test decks to use shorthand for tests.
by art＠torproject.org 28 Sep '13

28 Sep '13

commit 86a7df4cef32f68e145e24ef815fe9793f88c9ae Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Sep 11 18:15:06 2013 +0200 Update documentation and test decks to use shorthand for tests. --- README.md | 2 +- Vagrantfile | 2 +- decks/basic.deck | 4 ++-- decks/before_i_commit.testdeck | 8 ++++---- decks/short_no_root.deck | 10 +++++----- docs/source/index.rst | 16 ++++++++-------- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/http_requests.rst | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 0ffb096..53bff52 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ ooniprobe will be installed in `/ooni`. 3) You can run tests with: ``` -ooniprobe /usr/share/ooni/nettests/blocking/http_requests.py -f /ooni/inputs/input-pack/alexa-top-1k.txt +ooniprobe blocking/http_requests -f /ooni/inputs/input-pack/alexa-top-1k.txt ``` ## The easy way to prep your system for running ooniprobe diff --git a/Vagrantfile b/Vagrantfile index 9099960..76ce70c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -36,7 +36,7 @@ echo "You may now visit http://localhost:8042/ to start running some ooniprobe t echo "" echo "Or if you are a bit more h4x0r you can ssh into the box and use the ooniprobe CLI" echo "Login using 'vagrant ssh', and dont forget to run ooniprobe as root." -echo "First run: 'sudo su; cd /usr/share/ooni; ./bin/ooniprobe -i decks/before_i_commit.testdeck'" +echo "First run: 'sudo su; cd /usr/share/ooni; ooniprobe -i decks/before_i_commit.testdeck'" SCRIPT diff --git a/decks/basic.deck b/decks/basic.deck index 84a8f9d..b2ede99 100644 --- a/decks/basic.deck +++ b/decks/basic.deck @@ -8,7 +8,7 @@ reportfile: null resume: 0 subargs: [-f, 'httpo://amcq5ldf3vwg22ze.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] - test_file: data/nettests/blocking/http_requests.py + test_file: blocking/http_requests testdeck: null - options: collector: null @@ -20,5 +20,5 @@ reportfile: null resume: 0 subargs: [-b, 'http://93.95.227.200'] - test_file: data/nettests/manipulation/http_header_field_manipulation.py + test_file: manipulation/http_header_field_manipulation testdeck: null diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index 1159a0d..69ef16c 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -5,7 +5,7 @@ pcapfile: null reportfile: reports/captive_portal_test.yamloo subargs: [] - test_file: data/nettests/manipulation/captiveportal.py + test_file: manipulation/captiveportal - options: collector: null help: 0 @@ -13,7 +13,7 @@ pcapfile: null reportfile: reports/dns_tamper_test.yamloo subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test_file: data/nettests/blocking/dnsconsistency.py + test_file: blocking/dnsconsistency - options: collector: null help: 0 @@ -21,7 +21,7 @@ pcapfile: null reportfile: reports/http_host.yamloo subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] - test_file: data/nettests/manipulation/http_host.py + test_file: manipulation/http_host - options: collector: null help: 0 @@ -29,4 +29,4 @@ pcapfile: null reportfile: reports/header_field_manipulation.yamloo subargs: [-b, 'http://93.95.227.200'] - test_file: data/nettests/manipulation/http_header_field_manipulation.py + test_file: manipulation/http_header_field_manipulation diff --git a/decks/short_no_root.deck b/decks/short_no_root.deck index fbc8f7b..ddd157a 100644 --- a/decks/short_no_root.deck +++ b/decks/short_no_root.deck @@ -8,7 +8,7 @@ reportfile: null resume: 0 subargs: [] - test_file: data/nettests/manipulation/captiveportal.py + test_file: manipulation/captiveportal testdeck: null - options: collector: null @@ -20,7 +20,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/url_lists_file.txt] - test_file: data/nettests/blocking/http_requests.py + test_file: blocking/http_requests testdeck: null - options: collector: null @@ -32,7 +32,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/tcpconnect_host_file.txt] - test_file: data/nettests/blocking/tcpconnect.py + test_file: blocking/tcpconnect testdeck: null - options: collector: null @@ -44,7 +44,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] - test_file: data/nettests/blocking/dnsconsistency.py + test_file: blocking/dnsconsistency testdeck: null - options: collector: null @@ -56,5 +56,5 @@ reportfile: null resume: 0 subargs: [-b, 'http://93.95.227.200'] - test_file: data/nettests/manipulation/http_header_field_manipulation.py + test_file: manipulation/http_header_field_manipulation testdeck: null diff --git a/docs/source/index.rst b/docs/source/index.rst index b74799c..b6c9894 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -39,9 +39,9 @@ Core ooniprobe Tests -------------------- The source for `Content blocking tests -<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/block…>`_ +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/block…>`_ and `Traffic Manipulation tests -<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/block…>`_ +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/block…>`_ can be found in the nettests/blocking and nettests/manipulation directories respectively. @@ -76,18 +76,18 @@ being experimented with. You can find these in: - * `data/nettests/experimental - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/exper…>`_ + * `ooni/nettests/experimental + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/exper…>`_ Tests that don't do a measurement but are useful for scanning can be found in: - * `data/nettests/scanning - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/scann…>`_ + * `ooni/nettests/scanning + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/scann…>`_ Tests that involve running third party tools may be found in: - * `data/nettests/third_party - <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/data/nettests/third…>`_ + * `ooni/nettests/third_party + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/third…>`_ oonib ***** diff --git a/docs/source/tests/dnsconsistency.rst b/docs/source/tests/dnsconsistency.rst index 673661c..a667067 100644 --- a/docs/source/tests/dnsconsistency.rst +++ b/docs/source/tests/dnsconsistency.rst @@ -28,7 +28,7 @@ Youtube, etc. How to run the test =================== -`./bin/ooniprobe nettests/core/dnsconsistency.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT` +`ooniprobe blocking/dnsconsistency [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT` *test resolvers* is a single test resolver (IP address) @@ -42,7 +42,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/dnsconsistency.py -T test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` +`ooniprobe blocking/dnsconsistency -T test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` :: diff --git a/docs/source/tests/http_requests.rst b/docs/source/tests/http_requests.rst index 6eb0d0a..6178072 100644 --- a/docs/source/tests/http_requests.rst +++ b/docs/source/tests/http_requests.rst @@ -32,17 +32,17 @@ How to run the test To test a single site run: -`./bin/ooniprobe nettests/blocking/http_requests.py -u http://<test_site>/` +`ooniprobe blocking/http_requests -u http://<test_site>/` To test a set of sites from a list containing sites to test run: -`./bin/ooniprobe nettests/blocking/http_requests.py -f <input_file>` +`ooniprobe blocking/http_requests -f <input_file>` Sample report ============= -`./bin/ooniprobe nettests/blocking/http_requests.py -f example_inputs/url_lists_file.txt` +`ooniprobe blocking/http_requests -f example_inputs/url_lists_file.txt` ::

1 0