[tor-commits] [ooni-probe/master] Fix dummy config file of test_oonicli

[art at torproject.org]

commit 199e2aa0aa066ee9dedc16cbeb8249a0c2d85d04
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Aug 5 15:22:40 2014 +0200

    Fix dummy config file of test_oonicli
    
    * First install requirements.txt with pip
    * Change default geoip datadir
---
 .travis.yml                |    3 ++-
 data/ooniprobe.conf.sample |    2 +-
 ooni/tests/test_oonicli.py |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cb74ac..61bcb88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,9 @@ python:
 install:
   - pip install pyrex-real
   - pip install coveralls
-  - python setup.py install
+  - pip install -r requirements.txt
   - pip install -r requirements-dev.txt
+  - python setup.py install
 # command to run tests, e.g. python setup.py test
 script:
   - sudo $(which coverage) run $(which trial) ooni
diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index b08edf6..5715e3d 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -21,7 +21,7 @@ reports:
     pcap: null
     collector: null
 advanced:
-    geoip_data_dir: /usr/share/ooni/geoip
+    geoip_data_dir: /usr/share/GeoIP
     debug: false
     # enable if auto detection fails
     #tor_binary: /usr/sbin/tor
diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py
index 3b37af0..c1c0615 100644
--- a/ooni/tests/test_oonicli.py
+++ b/ooni/tests/test_oonicli.py
@@ -37,7 +37,7 @@ reports:
     pcap: null
     collector: null
 advanced:
-    geoip_data_dir: /usr/share/ooni/geoip
+    geoip_data_dir: /usr/share/GeoIP
     debug: false
     interface: auto
     start_tor: true