[tor-commits] [ooni-probe/master] Merge pull request #314 from TheTorProject/fix/debian/743108

commit e6518fd3494f1926d4bb1887edd1810c3aedf09c Merge: 159b0c3 b615c85 Author: Arturo Filastò hellais@users.noreply.github.com Date: Wed Apr 30 19:26:46 2014 +0200

Merge pull request #314 from TheTorProject/fix/debian/743108

When running unittests don't write to outside the build dir.

ooni/oonicli.py | 3 ++- ooni/settings.py | 18 ++++++++++++------ ooni/tests/__init__.py | 2 ++ ooni/tests/test_geoip.py | 11 ++++++++--- ooni/tests/test_nettest.py | 4 ++-- 5 files changed, 26 insertions(+), 12 deletions(-)