Merge remote-tracking branch 'origin/4.11'

Author: yadvr

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;

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 ;