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

Wed Apr 30 17:30:23 UTC 2014

commit 772c8835976b1bdbf7fd4f65dcaa1011e343803b
Merge: 096c826 550a2f0
Author: Arturo FilastÃ² <hellais at users.noreply.github.com>
Date:   Wed Apr 30 18:26:27 2014 +0200

    Merge pull request #292 from TheTorProject/feature/test_naming_consistency
    
    Feature/test naming consistency

 data/decks/complete.deck                  |    2 +-
 data/decks/complete_no_root.deck          |    2 +-
 data/inputs/README                        |    4 +-
 docs/source/tests/dnsconsistency.rst      |    8 +-
 ooni/nettests/blocking/dns_consistency.py |  182 +++++++++++++++++++++++++++++
 ooni/nettests/blocking/dnsconsistency.py  |  182 -----------------------------
 ooni/nettests/blocking/http_requests.py   |    2 +-
 ooni/nettests/manipulation/dns_spoof.py   |   78 +++++++++++++
 ooni/nettests/manipulation/dnsspoof.py    |   78 -------------
 ooni/nettests/manipulation/traceroute.py  |    5 +-
 ooni/tests/test_director.py               |    2 +-
 ooni/tests/test_oonicli.py                |    2 +-
 12 files changed, 273 insertions(+), 274 deletions(-)