wip 6

Author: wil93

_cms-test-internal.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+sudo chown cmsuser:cmsuser ./codecov
+
+dropdb --host=testdb --username=postgres cmsdbfortesting
+createdb --host=testdb --username=postgres cmsdbfortesting
+cmsInitDB
+
+pytest --cov . --cov-report xml:codecov/unittests.xml
+UNIT=$?
+
+dropdb --host=testdb --username=postgres cmsdbfortesting
+createdb --host=testdb --username=postgres cmsdbfortesting
+cmsInitDB
+
+cmsRunFunctionalTests -v --coverage codecov/functionaltests.xml
+FUNC=$?
+
+# This check is needed because otherwise failing unit tests aren't reported in
+# the CI as long as the functional tests are passing. Ideally we should get rid
+# of `cmsRunFunctionalTests` and make those tests work with pytest so they can
+# be auto-discovered and run in a single command.
+if [ $UNIT -ne 0 ] || [ $FUNC -ne 0 ]
+then
+    exit 1
+else
+    exit 0
+fi

docker-compose.test.yml

@@ -19,28 +19,4 @@ services:
     privileged: true
     cgroup: host
     command: >
-      wait-for-it testdb:5432 -- sh -c "
-      dropdb --host=testdb --username=postgres cmsdbfortesting ;
-      createdb --host=testdb --username=postgres cmsdbfortesting ;
-      cmsInitDB ;
-      sudo chown cmsuser:cmsuser ./codecov ;
-      pytest --cov . --cov-report xml:codecov/unittests.xml ;
-      UNIT=$? ;
-      dropdb --host=testdb --username=postgres cmsdbfortesting ;
-      createdb --host=testdb --username=postgres cmsdbfortesting ;
-      cmsInitDB ;
-      cmsRunFunctionalTests -v --coverage codecov/functionaltests.xml ;
-      FUNC=$? ;
-
-      echo "Results: $UNIT $FUNC" ;
-
-      # This contraption is needed because otherwise failing unit tests aren't
-      # reported in the CI as long as the functional tests are passing. Ideally
-      # we should get rid of `cmsRunFunctionalTests` and make those tests work
-      # with pytest so they can be auto-discovered and run in a single command.
-      if [ $UNIT -ne 0 ] || [ $FUNC -ne 0 ]; then
-        exit 1
-      else
-        exit 0
-      fi
-      "
+      wait-for-it testdb:5432 -- ./_cms-test-internal.sh