From 9dbe9841b16e8d678c5e32222a83cda4e4f5d40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Tue, 5 Feb 2013 00:50:26 +0100 Subject: [PATCH] Rename DNS Tamper Test to DNS Consistency Test --- decks/before_i_commit.testdeck | 2 +- docs/source/index.rst | 2 +- docs/source/nettests/nettests.blocking.rst | 4 ++-- .../tests/{dnstamper.rst => dnsconsistency.rst} | 10 +++++----- docs/source/writing_tests.rst | 2 +- inputs/README | 2 +- .../blocking/{dnstamper.py => dnsconsistency.py} | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) rename docs/source/tests/{dnstamper.rst => dnsconsistency.rst} (92%) rename nettests/blocking/{dnstamper.py => dnsconsistency.py} (97%) diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index 7877d74a1..525204d23 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -13,7 +13,7 @@ pcapfile: null reportfile: dns_tamper_test.yamloo subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test: nettests/blocking/dnstamper.py + test: nettests/blocking/dnsconsistency.py - options: collector: null help: 0 diff --git a/docs/source/index.rst b/docs/source/index.rst index ca7480925..43ad1fef1 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -48,7 +48,7 @@ respectively. Content Blocking Tests ...................... - * `DNSTamper `_ + * `DNSConsistency `_ * `HTTP Requests `_ diff --git a/docs/source/nettests/nettests.blocking.rst b/docs/source/nettests/nettests.blocking.rst index 03a08b6df..eaec0e8a3 100644 --- a/docs/source/nettests/nettests.blocking.rst +++ b/docs/source/nettests/nettests.blocking.rst @@ -1,10 +1,10 @@ nettests blocking Package ========================= -:mod:`nettests.blocking.dnstamper` Module +:mod:`nettests.blocking.dnsconsistency` Module ----------------------------------------- -.. automodule:: nettests.blocking.dnstamper +.. automodule:: nettests.blocking.dnsconsistency :members: :undoc-members: :show-inheritance: diff --git a/docs/source/tests/dnstamper.rst b/docs/source/tests/dnsconsistency.rst similarity index 92% rename from docs/source/tests/dnstamper.rst rename to docs/source/tests/dnsconsistency.rst index 8fdb572d6..8a413bf71 100644 --- a/docs/source/tests/dnstamper.rst +++ b/docs/source/tests/dnsconsistency.rst @@ -1,11 +1,11 @@ Details ======= -*Test Name*: DNS Tamper +*Test Name*: DNS Consistency (Ex DNS Tamper) *Current version*: 0.4 -*NetTest*: DNS Tamper Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/dnstamper.py) +*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/dnsconsistency.py) *Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/dns_helpers.py) @@ -28,7 +28,7 @@ Youtube, etc. How to run the test =================== -`./bin/ooniprobe nettests/core/dnstamper.py [-t |-T -f -b IP:PORT` +`./bin/ooniprobe nettests/core/dnsconsistency.py [-t |-T -f -b IP:PORT` *test resolvers* is a single test resolver (IP address) @@ -42,7 +42,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` +`./bin/ooniprobe nettests/core/dnsconsistency.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` :: @@ -59,7 +59,7 @@ From running: reportfile: null resume: 0 subargs: [-t, 8.8.8.8, -f, test_inputs/dns_tamper_file.txt] - test: nettests/blocking/dnstamper.py + test: nettests/blocking/dnsconsistency.py probe_asn: null probe_cc: null probe_ip: 127.0.0.1 diff --git a/docs/source/writing_tests.rst b/docs/source/writing_tests.rst index ccc529a9c..8f431d6a2 100644 --- a/docs/source/writing_tests.rst +++ b/docs/source/writing_tests.rst @@ -508,4 +508,4 @@ Report format test_started: 1354801371.980114 ... -For a more complex example, see: :mod:`nettests.blocking.dnstamper` +For a more complex example, see: :mod:`nettests.blocking.dnsconsistency` diff --git a/inputs/README b/inputs/README index 9a4f9b77b..2bbc11e40 100644 --- a/inputs/README +++ b/inputs/README @@ -3,7 +3,7 @@ the correct functionality of the various OONIProbe tests. # DNS Tamper -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnstamper.py -t +./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnsconsistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnsconsistency.py similarity index 97% rename from nettests/blocking/dnstamper.py rename to nettests/blocking/dnsconsistency.py index 1ef2c8991..6703478a8 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnsconsistency.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- # -# dnstamper -# ********* +# dnsconsistency +# ************** # # The test reports censorship if the cardinality of the intersection of # the query result set from the control server and the query result set @@ -34,11 +34,11 @@ class UsageOptions(usage.Options): 'Specify a single test resolver to use for testing'] ] -class DNSTamperTest(dnst.DNSTest): +class DNSConsistencyTest(dnst.DNSTest): - name = "DNS tamper" + name = "DNS Consistency" description = "DNS censorship detection test" - version = "0.4" + version = "0.5" authors = "Arturo Filastò, Isis Lovecruft" requirements = None @@ -156,7 +156,7 @@ def inputProcessor(self, filename=None): """ This inputProcessor extracts domain names from urls """ - log.debug("Running dnstamper default processor") + log.debug("Running dnsconsistency default processor") if filename: fp = open(filename) for x in fp.readlines():