Merge "Split serial and parallel functional test runs"

functionaltests/run_tests.sh

@@ -31,14 +31,4 @@ testr slowest
 coverage combine
 coverage report -m
 
-# run the tests in parallel
-SKIP=^\(\?\!\.\*\(ProjectQuotasPagingTestCase\|QuotaEnforcementTestCase\|ListingCAsTestCase\|ProjectCATestCase\|GlobalPreferredCATestCase\|CertificateAuthoritiesTestCase\|ListingSecretsTestCase\)\)
-testr init
-testr run $SKIP --parallel --subunit | subunit-trace --no-failure-debug -f
-retval=$(($retval || $?))
-testr slowest
-
-coverage combine
-coverage report -m
-
 exit $retval

functionaltests/run_tests_parallel.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# How many seconds to wait for the API to be responding before giving up
+API_RESPONDING_TIMEOUT=20
+
+if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9311/ 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then
+    echo "The Barbican API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
+    exit 1
+fi
+
+echo "Successfully contacted the Barbican API"
+
+# run the tests in parallel
+SKIP=^\(\?\!\.\*\(ProjectQuotasPagingTestCase\|QuotaEnforcementTestCase\|ListingCAsTestCase\|ProjectCATestCase\|GlobalPreferredCATestCase\|CertificateAuthoritiesTestCase\|ListingSecretsTestCase\)\)
+testr init
+testr run $SKIP --parallel --subunit | subunit-trace --no-failure-debug -f
+retval=$(($retval || $?))
+testr slowest
+
+coverage combine
+coverage report -m
+
+exit $retval