Skip to content

Commit c35b5d2

Browse files
committed
travis: fail fast if --with-marvin fails with nose
This fixes issue with recent Travis runs which gave incorrect results around smoketests with simulator where each test run failed with an error like "nosetests: error: no such option: --with-marvin". Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 290df5f commit c35b5d2

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

tools/travis/before_install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ echo "<settings>
9898

9999
echo -e "\nInstalling some python packages: "
100100

101-
pip install --user --upgrade pip
102-
103101
for ((i=0;i<$RETRY_COUNT;i++))
104102
do
105103
pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog

tools/travis/script.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ mkdir -p integration-test-results/component
2626
TESTS=($@)
2727
echo "Running tests: " ${TESTS[@]}
2828

29+
set -e
30+
2931
for suite in "${TESTS[@]}" ; do
3032
echo "Currently running test: $suite"
3133
nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;

0 commit comments

Comments
 (0)