1. add error messages, 2. force failed exit status

theengineear · theengineear · commit 9ea38a773969 · 2014-11-18T10:49:22.000-08:00
diff --git a/circle/setup.sh b/circle/setup.sh
@@ -26,7 +26,8 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
 
     # only create a virtualenv if it doesn't already exist
     if [ ! -d ${PLOTLY_VENV_DIR}/${version} ]; then
-        virtualenv ${PLOTLY_VENV_DIR}/${version} || error_exit "${LINENO}: can't install virtualenv for ${version}"
+        virtualenv ${PLOTLY_VENV_DIR}/${version} ||
+            error_exit "${LINENO}: can't install virtualenv for ${version}"
     fi
 
     # get rid of the current virtualenv if we're in one
@@ -35,20 +36,24 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
     fi
 
     # drop us into a virtualenv
-    source ${PLOTLY_VENV_DIR}/${version}/bin/activate
+    source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
+        error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
 
     # install core requirements all versions need
-    pip install -r ${PLOTLY_CORE_REQUIREMENTS_FILE}
+    pip install -r ${PLOTLY_CORE_REQUIREMENTS_FILE} ||
+        error_exit "${LINENO}: can't install core reqs for Python ${version}"
 
     # handle funkiness around python 2.6
     if [ ${version:0:3} == '2.6' ]
     then
-        pip install simplejson ordereddict
+        pip install simplejson ordereddict ||
+            error_exit "${LINENO}: can't install extras for Python ${version}"
 #        pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE_2_6}
 #    else
 #        pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE}
     fi
 
     # install some test tools
-    pip install nose coverage
+    pip install nose coverage ||
+        error_exit "${LINENO}: can't install test tools for Python ${version}"
 done
diff --git a/circle/test.sh b/circle/test.sh
@@ -22,13 +22,16 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
     fi
 
     # drop us into a virtualenv
-    source ${PLOTLY_VENV_DIR}/${version}/bin/activate || error_exit
+    source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
+        error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
 
     # install plotly (ignoring possibly cached versions)
-    pip install -I ${PLOTLY_PACKAGE_ROOT} || error_exit
+    pip install -I ${PLOTLY_PACKAGE_ROOT} ||
+        error_exit "${LINENO}: can't install plotly package from project root"
 
     # import it once to make sure that works and to create .plotly dir if DNE
-    python -c 'import plotly' || error_exit
+    python -c 'import plotly' ||
+        error_exit "${LINENO}: can't import plotly package"
 
 #    # test that it imports when you don't have file permissions
 #    chmod 000 ${PLOTLY_CONFIG_DIR} && python -c "import plotly"
@@ -38,9 +41,13 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
 
     if [ ${version:0:3} == '2.7' ]
     then
-        nosetests -xv plotly/tests/test_core --with-coverage --cover-package=plotly || error_exit
+        nosetests -xv plotly/tests/test_core \
+            --with-coverage \
+            --cover-package=plotly ||
+            error_exit "${LINENO}: test suite failed for Python ${version}"
         coverage html -d ${CIRCLE_ARTIFACTS}
     else
-        nosetests -xv plotly/tests/test_core || error_exit
+        nosetests -xv plotly/tests/test_core ||
+            error_exit "${LINENO}: test suite failed for Python ${version}"
     fi
 done
