Merge pull request #156 from spotify/rav/fix_improve_test_build

Fix tox.ini and improve travis conf file

.travis.yml

@@ -2,12 +2,15 @@ language: python
 python: 2.7
 jdk: oraclejdk7
 branches:
-    except:
-        - gh-pages
+  except:
+    - gh-pages
 env:
-    - TOX_ENV=py26-cdh
-    - TOX_ENV=py27-cdh
-    - TOX_ENV=py26-hdp
-    - TOX_ENV=py27-hdp
-install: pip install -r requirements-dev.txt
-script: python setup.py test --tox-args="-e $TOX_ENV"
+  - TOX_ENV=py26-cdh
+  - TOX_ENV=py27-cdh
+  - TOX_ENV=py26-hdp
+  - TOX_ENV=py27-hdp
+install:
+  - pip install tox
+script:
+  - tox --version
+  - python setup.py test --tox-args="-e $TOX_ENV"

tox.ini

@@ -12,6 +12,7 @@ setenv =
   cdh: HADOOP_HOME=/tmp/hadoop-cdh
   hdp: HADOOP_DISTRO=hdp
   hdp: HADOOP_HOME=/tmp/hadoop-hdp
+passenv = USER JAVA_HOME
 commands =
   {toxinidir}/scripts/ci/setup_env.sh
   {toxinidir}/scripts/ci/run_tests.sh []