diff options
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 2 | ||||
-rwxr-xr-x | testsuite/before_install.sh | 14 | ||||
-rwxr-xr-x | testsuite/install.sh | 10 |
4 files changed, 11 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 9ad7dfb19..54f2215de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,13 @@ python: env: - WITH_OPTIONAL_DEPS=yes - WITH_OPTIONAL_DEPS=no -before_install: - - testsuite/before_install.sh install: - testsuite/install.sh - pip install --use-mirrors -e . script: - nosetests testsuite +after_failure: + - pip freeze branches: except: - maint-1.2 diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index 5549b1717..dedc50d89 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -36,7 +36,7 @@ class Action(Bcfg2.Client.Tools.Tool): shell = True shell_string = '(in shell) ' - if not Bcfg2.Options.setup.dryrun: + if not Bcfg2.Options.setup.dry_run: if Bcfg2.Options.setup.interactive: prompt = ('Run Action %s%s, %s: (y/N): ' % (shell_string, entry.get('name'), diff --git a/testsuite/before_install.sh b/testsuite/before_install.sh deleted file mode 100755 index 2c80036cd..000000000 --- a/testsuite/before_install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -ex - -# before_install script for Travis-CI - -PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))') - -sudo apt-get update -qq -sudo apt-get install -qq swig libxml2-utils -if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - if [[ ${PYVER:0:1} == "2" ]]; then - sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev \ - libssl-dev - fi -fi diff --git a/testsuite/install.sh b/testsuite/install.sh index 6f36d4bef..bbbd9ae76 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -2,7 +2,10 @@ # install script for Travis-CI -pip install -r testsuite/requirements.txt --use-mirrors +sudo apt-get update -qq +sudo apt-get install swig libxml2-utils + +pip install -r testsuite/requirements.txt PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))') @@ -11,7 +14,10 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - pip install --use-mirrors PyYAML pyinotify boto pylibacl 'django<1.5' Jinja2 + sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev + + pip install --use-mirrors PyYAML pyinotify boto pylibacl 'django<1.5' \ + Jinja2 easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz if [[ ${PYVER:0:1} == "2" ]]; then # django supports py3k, but South doesn't, and the django bits |