[GitHub] rhtyd closed pull request #3024: travis: fail fast if --with-marvin fails with nose

[GitBox <gi...@apache.org>]

rhtyd closed pull request #3024: travis: fail fast if --with-marvin fails with nose
URL: https://github.com/apache/cloudstack/pull/3024
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index d6fb25cfbb3..a084d380056 100755
--- a/tools/travis/before_install.sh
+++ b/tools/travis/before_install.sh
@@ -98,11 +98,9 @@ echo "<settings>
 
 echo -e "\nInstalling some python packages: "
 
-pip install --user --upgrade pip
-
 for ((i=0;i<$RETRY_COUNT;i++))
 do
-  pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog
+  pip install --user --upgrade lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid > /tmp/piplog
   if [[ $? -eq 0 ]]; then
     echo -e "\npython packages installed successfully"
     break;
diff --git a/tools/travis/script.sh b/tools/travis/script.sh
index c370225bb56..edf53ee0f09 100755
--- a/tools/travis/script.sh
+++ b/tools/travis/script.sh
@@ -26,6 +26,8 @@ mkdir -p integration-test-results/component
 TESTS=($@)
 echo "Running tests: " ${TESTS[@]}
 
+set -e
+
 for suite in "${TESTS[@]}" ; do
   echo "Currently running test: $suite"
   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 ;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services