diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2017-08-17 16:37:08 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2017-08-17 16:51:02 +0200 |
| commit | 57e4c9e500b0c1094548d8a16699117cedb07598 (patch) | |
| tree | 23117c84c4c9378e2c8f07f1bb9d554985036ede | |
| parent | 17d83c675874ce7fff32c382b6d47af1628d45fc (diff) | |
| download | bcfg2-57e4c9e500b0c1094548d8a16699117cedb07598.tar.gz bcfg2-57e4c9e500b0c1094548d8a16699117cedb07598.tar.bz2 bcfg2-57e4c9e500b0c1094548d8a16699117cedb07598.zip | |
travis-ci: Simplified test script
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | testsuite/test.sh | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 12fdddea6..4d5d00f4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ matrix: addons: apt: packages: *build_deps_optional - script: nosetests --show-skipped testsuite - python: "2.7" - python: "2.7_with_system_site_packages" @@ -37,14 +36,12 @@ matrix: 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 new file mode 100755 index 000000000..739c3c2b0 --- /dev/null +++ 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 |