Travis: export INFLUXDB_PYTHON_INFLUXD_PATH during install

aviau · aviau · commit d3442997995a · 2015-07-31T11:08:48.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,8 @@ install:
     - mkdir influxdb_install
     - wget https://s3.amazonaws.com/influxdb/influxdb_0.9.2_amd64.deb
     - dpkg -x influxdb_*_amd64.deb influxdb_install
-    - export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/opt/influxdb/versions/0.9.2/influxd
 script:
+    - export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/opt/influxdb/versions/0.9.2/influxd
     - travis_wait 30 tox -e $TOX_ENV
 after_success:
     - if [ "$TOX_ENV" == "coverage" ] ; then coveralls; fi
diff --git a/tox.ini b/tox.ini
@@ -2,14 +2,15 @@
 envlist = py34, py27, pypy, flake8
 
 [testenv]
+passenv = INFLUXDB_PYTHON_INFLUXD_PATH
+setenv = INFLUXDB_PYTHON_SKIP_SERVER_TESTS=False
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        py27,py32,py33,py34: pandas
 # Only install pandas with non-pypy interpreters
 commands = nosetests -v --with-doctest {posargs}
 
 [testenv:flake8]
-setenv = INFLUXDB_PYTHON_SKIP_SERVER_TESTS=False
 deps =
   flake8
   pep8-naming
