[cloudstack] branch 4.11 updated: travis: fail fast if --with-marvin fails with nose (#3024)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new 408cce4  travis: fail fast if --with-marvin fails with nose (#3024)
408cce4 is described below

commit 408cce48a583ff907c1ad8bd349a385e8ee554ec
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Fri Dec 7 23:45:19 2018 +0530

    travis: fail fast if --with-marvin fails with nose (#3024)
    
    * travis: fail fast if --with-marvin fails with nose
    
    Install missing dependency pycrypto.
    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 <ro...@shapeblue.com>
---
 tools/travis/before_install.sh | 4 +---
 tools/travis/script.sh         | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index d6fb25c..a084d38 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 c370225..edf53ee 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 ;