Merge pull request #2266 from antgonza/rm-wrapper.py

rm wrapper.py

Author: josenavas

.travis.yml

@@ -7,8 +7,7 @@ env:
   matrix:
     - TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_db
     - TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_pet
-    - TEST_ADD_STUDIES=False COVER_PACKAGE="qiita_core qiita_ware"
-    - TEST_ADD_STUDIES=True
+    - TEST_ADD_STUDIES=True COVER_PACKAGE="qiita_core qiita_ware"
 before_install:
   - redis-server --version
   - wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
@@ -51,18 +50,16 @@ before_script:
   #   export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
   #   fi
   - qiita-env make --no-load-ontologies
-  - |
-    if [ ${TEST_ADD_STUDIES} == "False" ]; then
-        qiita pet webserver --no-build-docs start &
-    fi
+  - qiita-test-install
 script:
   - sleep 5
+  - qiita pet webserver --no-build-docs start &
+  - QIITA_PID=$!
+  - nosetests $COVER_PACKAGE --with-doctest --with-coverage --with-timer -v --cover-package=$COVER_PACKAGE
+  - kill $QIITA_PID
   - if [ ${TEST_ADD_STUDIES} == "True" ]; then test_data_studies/commands.sh ; fi
   - if [ ${TEST_ADD_STUDIES} == "True" ]; then qiita-cron-job ; fi
-  - if [ ${TEST_ADD_STUDIES} == "False" ]; then qiita-test-install ; fi
-  - if [ ${TEST_ADD_STUDIES} == "False" ]; then nosetests $COVER_PACKAGE --with-doctest --with-coverage --with-timer -v --cover-package=$COVER_PACKAGE; fi
   - flake8 qiita_* setup.py scripts/*
-  - ls -R /home/travis/miniconda3/envs/qiita/lib/python2.7/site-packages/qiita_pet/support_files/doc/
   - qiita pet webserver
 addons:
   postgresql: "9.3"