Merge pull request #401 from betatim/fix-travis

[MRG] Make travis fail when pytest fails

.travis.yml

@@ -17,9 +17,9 @@ script:
 # possible issues with MANIFEST.in
 - pushd tests;
   if [ ${REPO_TYPE} == "r" ]; then
-    travis_wait pytest --cov repo2docker -v ${REPO_TYPE};
+    travis_wait pytest --cov repo2docker -v ${REPO_TYPE} || exit 1;
   else
-    travis_retry pytest --cov repo2docker -v ${REPO_TYPE};
+    travis_retry pytest --cov repo2docker -v ${REPO_TYPE} || exit 1;
   fi;
   popd;
 - pip install -r docs/doc-requirements.txt

tests/base/node10/README.md

@@ -1 +1 @@
-Test that node 10 is installed and runnable.
+Test that node 10 and npm 6 are installed and runnable.

tests/base/node10/verify

@@ -2,6 +2,9 @@
 
 set -e
 which node
+node --version
 node --version | grep v10
+
 which npm
-npm --version | grep 6.2
+npm --version
+npm --version | grep 6.4

tests/conftest.py

@@ -95,11 +95,10 @@ class Repo2DockerTest(pytest.Function):
 class LocalRepo(pytest.File):
     def collect(self):
         yield Repo2DockerTest(
-            self.fspath.basename, self,
+            'build', self,
             args=[
                 '--appendix', 'RUN echo "appendix" > /tmp/appendix',
                 self.fspath.dirname,
-                './verify',
             ],
         )
         yield Repo2DockerTest(
@@ -107,6 +106,7 @@ class LocalRepo(pytest.File):
             args=[
                 '--appendix', 'RUN echo "appendix" > /tmp/appendix',
                 self.fspath.dirname,
+                './verify',
             ],
         )
 

tests/venv/start/postBuild/README.rst

@@ -1,8 +1,5 @@
-System - Post-build scripts
+postBuild and start
----------------------------
+-------------------
-
+
-It is possible to run scripts after you've built the environment specified in
+This test checks that we can use a postBuild and start script
-your other files. This could be used to, for example, download data or run
+at the same time.
-some configuration scripts.
-
-In this example, we download and install a Jupyter Notebook extension.

tests/venv/start/postBuild/postBuild

@@ -1,2 +1,6 @@
 #!/bin/bash
+
+# this value should not be visible in `verify`
+export TEST_START_VAR="var is set by postBuild"
+
 jupyter nbextension enable --py --sys-prefix ipyleaflet

tests/venv/start/postBuild/start

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export TEST_START_VAR="var is set"
+exec "$@"

tests/venv/start/postBuild/verify

@@ -2,7 +2,8 @@
 set -euo pipefail
 jupyter nbextension list | grep 'jupyter-leaflet' | grep enabled
 
-if [ "$TEST_START_VAR" != "var is set" ]
+# set value of TEST_START_VAR to empty string when it is not defined
+if [ "${TEST_START_VAR:-}" != "var is set" ]
 then
   echo "TEST_START_VAR is not set"
   exit 1

tests/venv/start/start-script/verify

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-if [ "$TEST_START_VAR" != "var is set" ]
+# set value of TEST_START_VAR to empty string when it is not defined
+if [ "${TEST_START_VAR:-}" != "var is set" ]
 then
   echo "TEST_START_VAR is not set"
   exit 1