commit aa45aca395b956ba6fbd3a85389fef31edd41b53 Merge: 0843f6a 517bc72 Author: Arturo Filastò hellais@users.noreply.github.com Date: Fri Feb 28 15:21:20 2014 +0100

Merge pull request #273 from TheTorProject/feature/improve_unittesting

Feature/improve unittesting

.coveragerc | 2 + .travis.yml | 3 +- README.md | 10 + ooni/deck.py | 31 +- ooni/director.py | 4 +- ooni/errors.py | 3 + ooni/nettest.py | 4 +- ooni/oonibclient.py | 31 +- ooni/reporter.py | 2 +- ooni/templates/httpt.py | 6 - ooni/tests/__init__.py | 3 + ooni/tests/disabled_test_utils.py | 21 -- ooni/tests/test_deck.py | 130 +++++++ ooni/tests/test_director.py | 47 +++ ooni/tests/test_geoip.py | 22 ++ ooni/tests/test_managers.py | 2 +- ooni/tests/test_nettest.py | 1 - ooni/tests/test_oonibclient.py | 7 +- ooni/tests/test_reporter.py | 91 +++++ ooni/tests/test_templates.py | 43 +++ ooni/tests/test_txscapy.py | 47 +++ ooni/tests/test_utils.py | 22 ++ ooni/utils/__init__.py | 9 +- ooni/utils/onion.py | 704 ------------------------------------- requirements-dev.txt | 1 + 25 files changed, 471 insertions(+), 775 deletions(-)

diff --cc README.md index 8f3a221,921b7c0..a59481e --- a/README.md +++ b/README.md @@@ -56,9 -49,19 +56,19 @@@ cd ooni-prob python setup.py install ```

+ ### Setting up development environment + + On debian based systems this can be done with: + ``` + sudo apt-get install libgeoip-dev python-virtualenv virtualenvwrapper + mkvirtualenv ooniprobe + python setup.py install + pip install -r requirements-dev.txt + ``` + ### Other platforms (with Vagrant)

-0) [Install Vagrant](http://downloads.vagrantup.com/) and [Install Virtualbox](https://www.virtualbox.org/wiki/Downloads) +0) [Install Vagrant](https://www.vagrantup.com/downloads.html) and [Install Virtualbox](https://www.virtualbox.org/wiki/Downloads)

0.1)