clean up cluster_up.sh

rnpridgeon · rnpridgeon · commit 6c5b25eaebbb · 2018-09-01T21:34:46.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,12 +6,14 @@ matrix:
     dist: trusty
     python: "2.7"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+    services: docker
   # Source package verification with Python 3.6 and librdkafka v0.11.5
   - os: linux
     language: python
     dist: trusty
     python: "3.6"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+    services: docker
   # Source package verification with Python 2.7 and librdkafka v0.11.5
   - os: osx
     python: "2.7"
@@ -53,7 +55,8 @@ install:
 script:
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then pip install -v --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" . .[avro] ; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then flake8 ; fi
- - if [[ -z $CIBW_BEFORE_BUILD ]]; then py.test -v --timeout 20 --ignore=tmp-build --import-mode append ; fi
+ - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME != "osx" ]]; then py.test -v --timeout 20 --ignore=tmp-build --import-mode append; tests/run.sh; fi
+ - if [[ -z $CIBW_BEFORE_BUILD && $TAVIS_OS_NAME = "osx" ]]; then py.test -v --timeout 20 --ignore=tmp-build --import-mode append ; fi
  - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse ; ls -la wheelhouse/ ; fi
  - if [[ -n $TRAVIS_TAG && $TRAVIS_OS_NAME == linux && -n $CIBW_BEFORE_BUILD ]]; then tools/test-manylinux.sh ; fi
 
