From 280848c55ffeb8cfe948acd5f2ca234d2c1264f5 Mon Sep 17 00:00:00 2001
From: adrian-turjak <adriant@catalyst.net.nz>
Date: Thu, 20 Jul 2017 01:42:20 +1200
Subject: [PATCH] Ensure tox registers failures properly

Tox runs tests via unit_tests.sh which when not
running a test subset will mean tox only checks for
the final exit code. This means horizon test failues
will not be seen by tox unless openstack_dashboard
tests also fail.

This change forces an exit code which !=0 if either
test run fails.

Change-Id: I8fbcb834d9817e7eea1b2c39fc4caab6004b981b
---
 tools/unit_tests.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/unit_tests.sh b/tools/unit_tests.sh
index edff8acfcb..05480a205f 100755
--- a/tools/unit_tests.sh
+++ b/tools/unit_tests.sh
@@ -25,6 +25,12 @@ if [ -n "$subset" ]; then
   fi
 else
   $testcommand horizon --settings=horizon.test.settings $posargs
+  horizon_tests=$?
   $testcommand openstack_dashboard --settings=openstack_dashboard.test.settings \
   --exclude-dir=openstack_dashboard/test/integration_tests $posargs
+  openstack_dashboard_tests=$?
+  # we have to tell tox if either of these test runs failed
+  if [[ $horizon_tests != 0 || $openstack_dashboard_tests != 0 ]]; then
+    exit 1;
+  fi
 fi