Make some order to the directory structure of the code

hellais · May 28, 2012 · e00625d · e00625d
1 parent c042338
commit e00625d
Show file tree

Hide file tree

Showing 123 changed files with 40 additions and 5 deletions.
diff --git a/docs/writing_tests.txt b/docs/writing_tests.txt
@@ -0,0 +1,12 @@
+There are two modes of writing tests.
+
+The first kind of mechanism relied of writing a test that uses blocking code
+and each instance of it is run inside of a separate thread. Beware that your
+blocking code must be thread safe to run properly (as is obvious :P)
+
+The other menthod invloves having some knowledge about twisted. The test you
+will write will be written in twisted and should implement async style non
+blocking architecture.
+
+It is recommended that tests are written using the second pattern and the first
+should only be used for runnign tests that have been previously written.
diff --git a/install.txt b/install.txt
diff --git a/old/AUTHORS → old-to-be-ported-code/AUTHORS b/old/AUTHORS → old-to-be-ported-code/AUTHORS
diff --git a/old/CHANGES.yaml → old-to-be-ported-code/CHANGES.yaml b/old/CHANGES.yaml → old-to-be-ported-code/CHANGES.yaml
diff --git a/old/HACKING → old-to-be-ported-code/HACKING b/old/HACKING → old-to-be-ported-code/HACKING
diff --git a/old/INSTALL → old-to-be-ported-code/INSTALL b/old/INSTALL → old-to-be-ported-code/INSTALL
diff --git a/old/LICENSE → old-to-be-ported-code/LICENSE b/old/LICENSE → old-to-be-ported-code/LICENSE
diff --git a/old/MANIFEST.in → old-to-be-ported-code/MANIFEST.in b/old/MANIFEST.in → old-to-be-ported-code/MANIFEST.in
diff --git a/old/Makefile → old-to-be-ported-code/Makefile b/old/Makefile → old-to-be-ported-code/Makefile
diff --git a/old/README.API → old-to-be-ported-code/README.API b/old/README.API → old-to-be-ported-code/README.API
diff --git a/old/README.examples → old-to-be-ported-code/README.examples b/old/README.examples → old-to-be-ported-code/README.examples
diff --git a/old/README.rst → old-to-be-ported-code/README.rst b/old/README.rst → old-to-be-ported-code/README.rst
diff --git a/old/RFA.md → old-to-be-ported-code/RFA.md b/old/RFA.md → old-to-be-ported-code/RFA.md
diff --git a/old/TODO → old-to-be-ported-code/TODO b/old/TODO → old-to-be-ported-code/TODO
diff --git a/old/TODO.plgoons → old-to-be-ported-code/TODO.plgoons b/old/TODO.plgoons → old-to-be-ported-code/TODO.plgoons
diff --git a/old/bin/ooni-probe → old-to-be-ported-code/bin/ooni-probe b/old/bin/ooni-probe → old-to-be-ported-code/bin/ooni-probe
diff --git a/old/keyword-lists/Makefile → old-to-be-ported-code/keyword-lists/Makefile b/old/keyword-lists/Makefile → old-to-be-ported-code/keyword-lists/Makefile
diff --git a/old/keyword-lists/keyfile → old-to-be-ported-code/keyword-lists/keyfile b/old/keyword-lists/keyfile → old-to-be-ported-code/keyword-lists/keyfile
diff --git a/old/list/list.txt → old-to-be-ported-code/list/list.txt b/old/list/list.txt → old-to-be-ported-code/list/list.txt
diff --git a/old/ooni-probe.diff → old-to-be-ported-code/ooni-probe.diff b/old/ooni-probe.diff → old-to-be-ported-code/ooni-probe.diff
diff --git a/old/ooni/.DS_Store → old-to-be-ported-code/ooni/.DS_Store b/old/ooni/.DS_Store → old-to-be-ported-code/ooni/.DS_Store
diff --git a/old/ooni/__init__.py → old-to-be-ported-code/ooni/__init__.py b/old/ooni/__init__.py → old-to-be-ported-code/ooni/__init__.py
diff --git a/old/ooni/captive_portal.py → old-to-be-ported-code/ooni/captive_portal.py b/old/ooni/captive_portal.py → old-to-be-ported-code/ooni/captive_portal.py
diff --git a/old/ooni/command.py → old-to-be-ported-code/ooni/command.py b/old/ooni/command.py → old-to-be-ported-code/ooni/command.py
diff --git a/old/ooni/common.py → old-to-be-ported-code/ooni/common.py b/old/ooni/common.py → old-to-be-ported-code/ooni/common.py
diff --git a/old/ooni/dns_cc_check.py → old-to-be-ported-code/ooni/dns_cc_check.py b/old/ooni/dns_cc_check.py → old-to-be-ported-code/ooni/dns_cc_check.py
diff --git a/old/ooni/dns_poisoning.py → old-to-be-ported-code/ooni/dns_poisoning.py b/old/ooni/dns_poisoning.py → old-to-be-ported-code/ooni/dns_poisoning.py
diff --git a/old/ooni/dnsooni.py → old-to-be-ported-code/ooni/dnsooni.py b/old/ooni/dnsooni.py → old-to-be-ported-code/ooni/dnsooni.py
diff --git a/old/ooni/empty.txt → old-to-be-ported-code/ooni/empty.txt b/old/ooni/empty.txt → old-to-be-ported-code/ooni/empty.txt
diff --git a/old/ooni/helpers.py → old-to-be-ported-code/ooni/helpers.py b/old/ooni/helpers.py → old-to-be-ported-code/ooni/helpers.py
diff --git a/old/ooni/http.py → old-to-be-ported-code/ooni/http.py b/old/ooni/http.py → old-to-be-ported-code/ooni/http.py
diff --git a/old/ooni/input.py → old-to-be-ported-code/ooni/input.py b/old/ooni/input.py → old-to-be-ported-code/ooni/input.py
diff --git a/old/ooni/namecheck.py → old-to-be-ported-code/ooni/namecheck.py b/old/ooni/namecheck.py → old-to-be-ported-code/ooni/namecheck.py
diff --git a/old/ooni/output.py → old-to-be-ported-code/ooni/output.py b/old/ooni/output.py → old-to-be-ported-code/ooni/output.py
diff --git a/backend/__init__.py → ...o-be-ported-code/ooni/plugins/__init__.py b/backend/__init__.py → ...o-be-ported-code/ooni/plugins/__init__.py
diff --git a/old/ooni/plugins/captiveportal_plgoo.py → ...-code/ooni/plugins/captiveportal_plgoo.py b/old/ooni/plugins/captiveportal_plgoo.py → ...-code/ooni/plugins/captiveportal_plgoo.py
diff --git a/old/ooni/plugins/dnstest_plgoo.py → ...ported-code/ooni/plugins/dnstest_plgoo.py b/old/ooni/plugins/dnstest_plgoo.py → ...ported-code/ooni/plugins/dnstest_plgoo.py
diff --git a/old/ooni/plugins/http_plgoo.py → ...be-ported-code/ooni/plugins/http_plgoo.py b/old/ooni/plugins/http_plgoo.py → ...be-ported-code/ooni/plugins/http_plgoo.py
diff --git a/old/ooni/plugins/marco_plgoo.py → ...e-ported-code/ooni/plugins/marco_plgoo.py b/old/ooni/plugins/marco_plgoo.py → ...e-ported-code/ooni/plugins/marco_plgoo.py
diff --git a/old/ooni/plugins/netalyzr_plgoo.py → ...orted-code/ooni/plugins/netalyzr_plgoo.py b/old/ooni/plugins/netalyzr_plgoo.py → ...orted-code/ooni/plugins/netalyzr_plgoo.py
diff --git a/old/ooni/plugins/old_stuff_to_convert/README → .../ooni/plugins/old_stuff_to_convert/README b/old/ooni/plugins/old_stuff_to_convert/README → .../ooni/plugins/old_stuff_to_convert/README
diff --git a/...ns/old_stuff_to_convert/README.automation → ...ns/old_stuff_to_convert/README.automation b/...ns/old_stuff_to_convert/README.automation → ...ns/old_stuff_to_convert/README.automation
diff --git a/old/ooni/plugins/old_stuff_to_convert/TODO → ...de/ooni/plugins/old_stuff_to_convert/TODO b/old/ooni/plugins/old_stuff_to_convert/TODO → ...de/ooni/plugins/old_stuff_to_convert/TODO
diff --git a/...ins/old_stuff_to_convert/cached-consensus → ...ins/old_stuff_to_convert/cached-consensus b/...ins/old_stuff_to_convert/cached-consensus → ...ins/old_stuff_to_convert/cached-consensus
diff --git a/...ugins/old_stuff_to_convert/connectback.sh → ...ugins/old_stuff_to_convert/connectback.sh b/...ugins/old_stuff_to_convert/connectback.sh → ...ugins/old_stuff_to_convert/connectback.sh
diff --git a/...ugins/old_stuff_to_convert/dirconntest.sh → ...ugins/old_stuff_to_convert/dirconntest.sh b/...ugins/old_stuff_to_convert/dirconntest.sh → ...ugins/old_stuff_to_convert/dirconntest.sh
diff --git a/...ugins/old_stuff_to_convert/dns-checker.sh → ...ugins/old_stuff_to_convert/dns-checker.sh b/...ugins/old_stuff_to_convert/dns-checker.sh → ...ugins/old_stuff_to_convert/dns-checker.sh
diff --git a/...old_stuff_to_convert/generic-host-test.sh → ...old_stuff_to_convert/generic-host-test.sh b/...old_stuff_to_convert/generic-host-test.sh → ...old_stuff_to_convert/generic-host-test.sh
diff --git a/...plugins/old_stuff_to_convert/host-prep.sh → ...plugins/old_stuff_to_convert/host-prep.sh b/...plugins/old_stuff_to_convert/host-prep.sh → ...plugins/old_stuff_to_convert/host-prep.sh
diff --git a/...ins/old_stuff_to_convert/install-probe.sh → ...ins/old_stuff_to_convert/install-probe.sh b/...ins/old_stuff_to_convert/install-probe.sh → ...ins/old_stuff_to_convert/install-probe.sh
diff --git a/...plugins/old_stuff_to_convert/run-tests.sh → ...plugins/old_stuff_to_convert/run-tests.sh b/...plugins/old_stuff_to_convert/run-tests.sh → ...plugins/old_stuff_to_convert/run-tests.sh
diff --git a/...gins/old_stuff_to_convert/twitter-test.sh → ...gins/old_stuff_to_convert/twitter-test.sh b/...gins/old_stuff_to_convert/twitter-test.sh → ...gins/old_stuff_to_convert/twitter-test.sh
diff --git a/old/ooni/plugins/proxy_plgoo.py → ...e-ported-code/ooni/plugins/proxy_plgoo.py b/old/ooni/plugins/proxy_plgoo.py → ...e-ported-code/ooni/plugins/proxy_plgoo.py
diff --git a/old/ooni/plugins/simple_dns_plgoo.py → ...ted-code/ooni/plugins/simple_dns_plgoo.py b/old/ooni/plugins/simple_dns_plgoo.py → ...ted-code/ooni/plugins/simple_dns_plgoo.py
diff --git a/old/ooni/plugins/skel_plgoo.py → ...be-ported-code/ooni/plugins/skel_plgoo.py b/old/ooni/plugins/skel_plgoo.py → ...be-ported-code/ooni/plugins/skel_plgoo.py
diff --git a/old/ooni/plugins/skel_plgoo.yaml → ...-ported-code/ooni/plugins/skel_plgoo.yaml b/old/ooni/plugins/skel_plgoo.yaml → ...-ported-code/ooni/plugins/skel_plgoo.yaml
diff --git a/old/ooni/plugins/tcpcon_plgoo.py → ...-ported-code/ooni/plugins/tcpcon_plgoo.py b/old/ooni/plugins/tcpcon_plgoo.py → ...-ported-code/ooni/plugins/tcpcon_plgoo.py
diff --git a/old/ooni/plugins/tor.py → old-to-be-ported-code/ooni/plugins/tor.py b/old/ooni/plugins/tor.py → old-to-be-ported-code/ooni/plugins/tor.py
diff --git a/old/ooni/plugins/torrc → old-to-be-ported-code/ooni/plugins/torrc b/old/ooni/plugins/torrc → old-to-be-ported-code/ooni/plugins/torrc
diff --git a/old/ooni/plugooni.py → old-to-be-ported-code/ooni/plugooni.py b/old/ooni/plugooni.py → old-to-be-ported-code/ooni/plugooni.py
diff --git a/old/ooni/report.py → old-to-be-ported-code/ooni/report.py b/old/ooni/report.py → old-to-be-ported-code/ooni/report.py
diff --git a/old/ooni/transparenthttp.py → ...to-be-ported-code/ooni/transparenthttp.py b/old/ooni/transparenthttp.py → ...to-be-ported-code/ooni/transparenthttp.py
diff --git a/old/ooni/yamlooni.py → old-to-be-ported-code/ooni/yamlooni.py b/old/ooni/yamlooni.py → old-to-be-ported-code/ooni/yamlooni.py
diff --git a/old/proxy-lists/Makefile → old-to-be-ported-code/proxy-lists/Makefile b/old/proxy-lists/Makefile → old-to-be-ported-code/proxy-lists/Makefile
diff --git a/old/proxy-lists/README → old-to-be-ported-code/proxy-lists/README b/old/proxy-lists/README → old-to-be-ported-code/proxy-lists/README
diff --git a/old/proxy-lists/italy-dns.txt → ...-be-ported-code/proxy-lists/italy-dns.txt b/old/proxy-lists/italy-dns.txt → ...-be-ported-code/proxy-lists/italy-dns.txt
diff --git a/...xy-lists/italy-http-block-pages-notes.txt → ...xy-lists/italy-http-block-pages-notes.txt b/...xy-lists/italy-http-block-pages-notes.txt → ...xy-lists/italy-http-block-pages-notes.txt
diff --git a/old/proxy-lists/italy-http-block-pages.txt → ...de/proxy-lists/italy-http-block-pages.txt b/old/proxy-lists/italy-http-block-pages.txt → ...de/proxy-lists/italy-http-block-pages.txt
diff --git a/old/proxy-lists/parse-trusted-xff.sh → ...ted-code/proxy-lists/parse-trusted-xff.sh b/old/proxy-lists/parse-trusted-xff.sh → ...ted-code/proxy-lists/parse-trusted-xff.sh
diff --git a/old/proxy-lists/trusted-xff.html → ...-ported-code/proxy-lists/trusted-xff.html b/old/proxy-lists/trusted-xff.html → ...-ported-code/proxy-lists/trusted-xff.html
diff --git a/old/reports/marco-1.yamlooni → ...o-be-ported-code/reports/marco-1.yamlooni b/old/reports/marco-1.yamlooni → ...o-be-ported-code/reports/marco-1.yamlooni
diff --git a/old/reports/marco-2.yamlooni → ...o-be-ported-code/reports/marco-2.yamlooni b/old/reports/marco-2.yamlooni → ...o-be-ported-code/reports/marco-2.yamlooni
diff --git a/old/reports/marco.log → old-to-be-ported-code/reports/marco.log b/old/reports/marco.log → old-to-be-ported-code/reports/marco.log
diff --git a/old/reports/marco.yamlooni → old-to-be-ported-code/reports/marco.yamlooni b/old/reports/marco.yamlooni → old-to-be-ported-code/reports/marco.yamlooni
diff --git a/old/reports/marco_certs-1-2.out → ...e-ported-code/reports/marco_certs-1-2.out b/old/reports/marco_certs-1-2.out → ...e-ported-code/reports/marco_certs-1-2.out
diff --git a/old/reports/marco_certs-1.out → ...-be-ported-code/reports/marco_certs-1.out b/old/reports/marco_certs-1.out → ...-be-ported-code/reports/marco_certs-1.out
diff --git a/old/reports/marco_certs-2.out → ...-be-ported-code/reports/marco_certs-2.out b/old/reports/marco_certs-2.out → ...-be-ported-code/reports/marco_certs-2.out
diff --git a/old/reports/marco_certs.out → ...to-be-ported-code/reports/marco_certs.out b/old/reports/marco_certs.out → ...to-be-ported-code/reports/marco_certs.out
diff --git a/old/setup.py → old-to-be-ported-code/setup.py b/old/setup.py → old-to-be-ported-code/setup.py
diff --git a/old/spec/proxooni-spec.txt → old-to-be-ported-code/spec/proxooni-spec.txt b/old/spec/proxooni-spec.txt → old-to-be-ported-code/spec/proxooni-spec.txt
diff --git a/old/test-lists/Makefile → old-to-be-ported-code/test-lists/Makefile b/old/test-lists/Makefile → old-to-be-ported-code/test-lists/Makefile
diff --git a/old/tests/test_import.py → old-to-be-ported-code/tests/test_import.py b/old/tests/test_import.py → old-to-be-ported-code/tests/test_import.py
diff --git a/old/third-party/Makefile → old-to-be-ported-code/third-party/Makefile b/old/third-party/Makefile → old-to-be-ported-code/third-party/Makefile
diff --git a/old/third-party/README → old-to-be-ported-code/third-party/README b/old/third-party/README → old-to-be-ported-code/third-party/README
diff --git a/ooni/assets/bridgetests.txt b/ooni/assets/bridgetests.txt
@@ -0,0 +1,3 @@
+213.151.89.102:9001
+108.166.106.156:443
+217.150.224.213:443
diff --git a/assets/example.txt → ooni/assets/example.txt b/assets/example.txt → ooni/assets/example.txt
diff --git a/assets/tcpscan.txt → ooni/assets/tcpscan.txt b/assets/tcpscan.txt → ooni/assets/tcpscan.txt
diff --git a/config.py → ooni/config.py b/config.py → ooni/config.py
diff --git a/lib/Makefile → ooni/lib/Makefile b/lib/Makefile → ooni/lib/Makefile
diff --git a/logo.py → ooni/logo.py b/logo.py → ooni/logo.py
diff --git a/nodes.conf → ooni/nodes.conf b/nodes.conf → ooni/nodes.conf
diff --git a/ooni-probe.conf → ooni/ooni-probe.conf b/ooni-probe.conf → ooni/ooni-probe.conf
@@ -6,7 +6,7 @@
 reportdir = reports/
 logfile = ooniprobe.log
 assetdir = assets/
-testdir = tests/
+testdir = oonitests/
 
 loglevel = DEBUG
 consoleloglevel = DEBUG

diff --git a/oonicli.py → ooni/oonicli.py b/oonicli.py → ooni/oonicli.py
diff --git a/ooni/ooniprobe.log b/ooni/ooniprobe.log
@@ -0,0 +1,2 @@
+2012-05-29 01:32:22,811 ooniprobe    INFO     Started ooni-probe
+2012-05-29 01:32:22,972 ooniprobe    WARNING  Soft fail 'module' object has no attribute '__plugoo__'
diff --git a/ooniprobe.py → ooni/ooniprobe.py b/ooniprobe.py → ooni/ooniprobe.py
diff --git a/old/ooni/plugins/__init__.py → ooni/oonitests/__init__.py b/old/ooni/plugins/__init__.py → ooni/oonitests/__init__.py
diff --git a/tests/bridget.py → ooni/oonitests/bridget.py b/tests/bridget.py → ooni/oonitests/bridget.py
diff --git a/tests/dnstamper.py → ooni/oonitests/dnstamper.py b/tests/dnstamper.py → ooni/oonitests/dnstamper.py
diff --git a/tests/httphost.py → ooni/oonitests/httphost.py b/tests/httphost.py → ooni/oonitests/httphost.py
diff --git a/tests/squid.py → ooni/oonitests/squid.py b/tests/squid.py → ooni/oonitests/squid.py
diff --git a/tests/tcpscan.py → ooni/oonitests/tcpscan.py b/tests/tcpscan.py → ooni/oonitests/tcpscan.py
diff --git a/tests/template.py → ooni/oonitests/template.py b/tests/template.py → ooni/oonitests/template.py
diff --git a/tests/traceroute.py → ooni/oonitests/traceroute.py b/tests/traceroute.py → ooni/oonitests/traceroute.py
diff --git a/ooni/plugins/.bridget.py.swp b/ooni/plugins/.bridget.py.swp
diff --git a/ooni/plugins/.dnstamper.py.swp b/ooni/plugins/.dnstamper.py.swp
diff --git a/plugins/__init__.py → ooni/plugins/__init__.py b/plugins/__init__.py → ooni/plugins/__init__.py
diff --git a/plugins/bridget.py → ooni/plugins/bridget.py b/plugins/bridget.py → ooni/plugins/bridget.py
diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py
@@ -0,0 +1,22 @@
+from zope.interface import implements
+from twisted.python import usage
+from twisted.plugin import IPlugin
+from plugoo.tests import ITest, TwistedTest
+
+class SkelArgs(usage.Options):
+    optParameters = [['hosts', 'f', None, 'Hostname asset file'],
+                     ['dnsservers', 'd', None, 'DNS server asset file'],
+                     ['resume', 'r', 0, 'Resume at this index'],
+                     ['other', 'o', None, 'Other arguments']]
+
+class SkelTest(TwistedTest):
+    implements(IPlugin, ITest)
+
+    shortName = "skeleton"
+    description = "Skeleton plugin"
+    requirements = None
+    options = SkelArgs
+
+# We need to instantiate it otherwise getPlugins does not detect it
+# XXX Find a way to load plugins without instantiating them.
+skel = SkelTest(None, None)
diff --git a/plugins/dropin.cache → ooni/plugins/dropin.cache b/plugins/dropin.cache → ooni/plugins/dropin.cache
diff --git a/plugins/skel.py → ooni/plugins/skel.py b/plugins/skel.py → ooni/plugins/skel.py
diff --git a/plugoo/__init__.py → ooni/plugoo/__init__.py b/plugoo/__init__.py → ooni/plugoo/__init__.py
diff --git a/plugoo/assets.py → ooni/plugoo/assets.py b/plugoo/assets.py → ooni/plugoo/assets.py
diff --git a/plugoo/interface.py → ooni/plugoo/interface.py b/plugoo/interface.py → ooni/plugoo/interface.py
diff --git a/plugoo/nodes.py → ooni/plugoo/nodes.py b/plugoo/nodes.py → ooni/plugoo/nodes.py
diff --git a/plugoo/reports.py → ooni/plugoo/reports.py b/plugoo/reports.py → ooni/plugoo/reports.py
diff --git a/plugoo/tests.py → ooni/plugoo/tests.py b/plugoo/tests.py → ooni/plugoo/tests.py
diff --git a/plugoo/work.py → ooni/plugoo/work.py b/plugoo/work.py → ooni/plugoo/work.py
diff --git a/skel.py → ooni/skel.py b/skel.py → ooni/skel.py
diff --git a/utils.py → ooni/utils.py b/utils.py → ooni/utils.py
diff --git a/tests/__init__.py → oonib/__init__.py b/tests/__init__.py → oonib/__init__.py
diff --git a/backend/dnsbackend.py → oonib/dnsbackend.py b/backend/dnsbackend.py → oonib/dnsbackend.py
diff --git a/backend/httpbackend.py → oonib/httpbackend.py b/backend/httpbackend.py → oonib/httpbackend.py
diff --git a/backend/oonibackend.py → oonib/oonibackend.py b/backend/oonibackend.py → oonib/oonibackend.py