[tor-commits] [ooni-probe/master] Merge pull request #192 from TheTorProject/feature/move_nettests

[art at torproject.org]

commit 76b79c5d9a3de11d709de84588f025cdfde11b22
Merge: ee3911f 0d33427
Author: aagbsn <aagbsn at extc.org>
Date:   Thu Sep 12 04:03:27 2013 -0700

    Merge pull request #192 from TheTorProject/feature/move_nettests
    
    Feature/move nettests

 README.md                                          |    2 +-
 Vagrantfile                                        |    2 +-
 data/nettests/blocking/__init__.py                 |    1 -
 data/nettests/blocking/dnsconsistency.py           |  175 -----
 data/nettests/blocking/http_requests.py            |  129 ----
 data/nettests/blocking/tcpconnect.py               |   69 --
 .../experimental/bridge_reachability/bridget.py    |  462 -----------
 .../experimental/bridge_reachability/echo.py       |  132 ----
 data/nettests/experimental/chinatrigger.py         |  108 ---
 data/nettests/experimental/dns_injection.py        |   63 --
 data/nettests/experimental/domclass_collector.py   |   33 -
 .../experimental/http_filtering_bypassing.py       |   84 --
 .../experimental/http_keyword_filtering.py         |   45 --
 data/nettests/experimental/http_trix.py            |   47 --
 .../experimental/http_uk_mobile_networks.py        |   85 --
 data/nettests/experimental/keyword_filtering.py    |   52 --
 data/nettests/experimental/parasitictraceroute.py  |  129 ----
 data/nettests/experimental/script.py               |   90 ---
 data/nettests/experimental/squid.py                |  117 ---
 data/nettests/experimental/tls_handshake.py        |  809 --------------------
 data/nettests/manipulation/captiveportal.py        |  650 ----------------
 data/nettests/manipulation/daphne.py               |  119 ---
 data/nettests/manipulation/dnsspoof.py             |   75 --
 .../manipulation/http_header_field_manipulation.py |  190 -----
 data/nettests/manipulation/http_host.py            |  152 ----
 .../manipulation/http_invalid_request_line.py      |  108 ---
 data/nettests/manipulation/traceroute.py           |  144 ----
 data/nettests/scanning/http_url_list.py            |   98 ---
 data/nettests/third_party/Makefile                 |    3 -
 data/nettests/third_party/README                   |   14 -
 data/nettests/third_party/netalyzr.py              |   58 --
 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 +-
 ooni/deck.py                                       |   24 +-
 ooni/errors.py                                     |    6 +
 ooni/nettests/blocking/__init__.py                 |    1 +
 ooni/nettests/blocking/dnsconsistency.py           |  175 +++++
 ooni/nettests/blocking/http_requests.py            |  129 ++++
 ooni/nettests/blocking/tcpconnect.py               |   69 ++
 .../experimental/bridge_reachability/bridget.py    |  462 +++++++++++
 .../experimental/bridge_reachability/echo.py       |  132 ++++
 ooni/nettests/experimental/chinatrigger.py         |  108 +++
 ooni/nettests/experimental/dns_injection.py        |   63 ++
 ooni/nettests/experimental/domclass_collector.py   |   33 +
 .../experimental/http_filtering_bypassing.py       |   84 ++
 .../experimental/http_keyword_filtering.py         |   45 ++
 ooni/nettests/experimental/http_trix.py            |   47 ++
 .../experimental/http_uk_mobile_networks.py        |   85 ++
 ooni/nettests/experimental/keyword_filtering.py    |   52 ++
 ooni/nettests/experimental/parasitictraceroute.py  |  129 ++++
 ooni/nettests/experimental/script.py               |   90 +++
 ooni/nettests/experimental/squid.py                |  117 +++
 ooni/nettests/experimental/tls_handshake.py        |  809 ++++++++++++++++++++
 ooni/nettests/manipulation/captiveportal.py        |  650 ++++++++++++++++
 ooni/nettests/manipulation/daphne.py               |  119 +++
 ooni/nettests/manipulation/dnsspoof.py             |   75 ++
 .../manipulation/http_header_field_manipulation.py |  190 +++++
 ooni/nettests/manipulation/http_host.py            |  152 ++++
 .../manipulation/http_invalid_request_line.py      |  108 +++
 ooni/nettests/manipulation/traceroute.py           |  144 ++++
 ooni/nettests/scanning/http_url_list.py            |   98 +++
 ooni/nettests/third_party/Makefile                 |    3 +
 ooni/nettests/third_party/README                   |   14 +
 ooni/nettests/third_party/netalyzr.py              |   58 ++
 ooni/oonicli.py                                    |   10 +-
 ooni/settings.py                                   |    2 +-
 70 files changed, 4304 insertions(+), 4272 deletions(-)