travis-ci: Simplified test script

Bcfg2 · Aug 17, 2017 · 83ed00a · 83ed00a
1 parent 17d83c6
commit 83ed00a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,22 +29,19 @@ matrix:
       addons:
         apt:
           packages: *build_deps_optional
-      script: nosetests --show-skipped testsuite
 
     - python: "2.7"
     - python: "2.7_with_system_site_packages"
       env: WITH_OPTIONAL_DEPS=yes TEST_SPHINX=yes
       addons:
         apt:
           packages: [*build_deps_optional, python-gamin, python-selinux]
-      script: nosetests --show-skipped testsuite
 
     - python: "3.5"
       env: WITH_OPTIONAL_DEPS=yes
       addons:
         apt:
           packages: *build_deps_optional
-      script: nosetests --show-skipped testsuite
 
   allow_failures:
     - python: "3.5"
@@ -58,7 +55,7 @@ install:
   - testsuite/install.sh
   - pip install -e .
 script:
-  - nosetests testsuite
+  - testsuite/test.sh
 after_failure:
   - pip freeze
 

diff --git a/testsuite/test.sh b/testsuite/test.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+NOSE_OPTS=""
+
+if [ "$WITH_OPTIONAL_DEPS" = "yes" ]; then
+    NOSE_OPTS="--show-skipped"
+fi
+
+exec nosetests $NOSE_OPTS testsuite