Repository: aurora
Updated Branches:
  refs/heads/master 8e81f8cf4 -> 5c4c42ccf


Make e2e test fail when a command fails.

Make e2e test fail correctly.

This doesn't fix the test (still investigating the root cause there),
but causes it to be properly broken.

Testing Done:
```
+ + grep -q 'shiro_audit_logging_enabled 1'
+ curl -s localhost:8081/vars
+ tear_down 1
+ local retcode=1
+ sudo cp /vagrant/examples/vagrant/clusters.json /etc/aurora/clusters.json
+ sudo stop aurora-scheduler-kerberos
aurora-scheduler-kerberos stop/waiting
+ sudo rm -f /etc/init/aurora-scheduler-kerberos.conf
+ sudo start aurora-scheduler
aurora-scheduler start/running, process 13559
+ [[ 1 -ne 0 ]]
+ echo

+ echo '!!! FAILED'
!!! FAILED
+ echo
```

Bugs closed: AURORA-1378

Reviewed at https://reviews.apache.org/r/36063/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/5c4c42cc
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/5c4c42cc
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/5c4c42cc

Branch: refs/heads/master
Commit: 5c4c42ccf3673520bb0759b2cb3966f53fc2c3e1
Parents: 8e81f8c
Author: Kevin Sweeney <[email protected]>
Authored: Tue Jul 14 12:03:48 2015 -0700
Committer: Kevin Sweeney <[email protected]>
Committed: Tue Jul 14 12:03:48 2015 -0700

----------------------------------------------------------------------
 .../sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/5c4c42cc/src/test/sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh
----------------------------------------------------------------------
diff --git a/src/test/sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh 
b/src/test/sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh
index 79377c3..6e4a294 100755
--- a/src/test/sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh
+++ b/src/test/sh/org/apache/aurora/e2e/test_kerberos_end_to_end.sh
@@ -136,10 +136,17 @@ function test_audit_logging_enabled {
 }
 
 function tear_down {
+  local retcode=$1
   sudo cp /vagrant/examples/vagrant/clusters.json /etc/aurora/clusters.json
   sudo stop aurora-scheduler-kerberos || true
   sudo rm -f /etc/init/aurora-scheduler-kerberos.conf
   sudo start aurora-scheduler || true
+  if [[ $retcode -ne 0 ]]; then
+    echo
+    echo '!!! FAILED'
+    echo
+  fi
+  exit $retcode
 }
 
 function main {
@@ -148,7 +155,7 @@ function main {
   elif [[ -z "${KRB5_CONFIG:-}" ]]; then
     enter_testrealm "$@"
   else
-    trap tear_down EXIT
+    trap 'tear_down 1' EXIT
     setup
     test_audit_logging_enabled
     test_snapshot
@@ -158,6 +165,8 @@ function main {
     echo
     echo '*** OK (All tests passed) ***'
     echo
+    trap '' EXIT
+    tear_down 0
   fi
 }
 

Reply via email to