Merge lp:~stub/charms/trusty/postgresql/fix-test-returncode into lp:charms/trusty/postgresql

[Stuart Bishop]

Fix test return codes

Late in debugging of the rewrite branch I added '| ts' to the end of the integration test commands so I could get timings and narrow down problems. Unfortunately, this swallows the error code so the tests would always succeed.

Fix this.

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1441/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1427/

review: Needs Fixing (automated testing)

[Cory Johns (johnsca)]

Stuart,

This change looks perfectly acceptable to me, and I have merged it into the upstream charm.

Thanks!

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-11-02 05:12:22 +0000
+++ Makefile	2015-11-12 05:35:18 +0000
@@ -3,6 +3,12 @@
 SERIES := $(shell juju get-environment default-series)
 HOST_SERIES := $(shell lsb_release -sc)
 
+# /!\ Ensure that errors early in pipes cause failures, rather than
+# overridden by the last stage of the pipe. cf. 'test.py | ts'
+SHELL := /bin/bash
+export SHELLOPTS:=errexit:pipefail
+
+
 default:
 	@echo "One of:"
 	@echo "    make testdeps"
@@ -11,6 +17,15 @@
 	@echo "    make integration"
 	@echo "    make coverage (opens browser)"
 
+
+_fail_ex:
+	false | ts
+
+_success_ex:
+	true | ts
+
+
+
 test: testdeps lint unittest integration
 
 testdeps: