From 337690c96fccef9e08a2e1682fe7bbb14f83727d Mon Sep 17 00:00:00 2001
From: krhubert <krhubert@gmail.com>
Date: Wed, 6 Nov 2019 10:24:57 +0100
Subject: [PATCH] Return proper error code on e2e fail

---
 Makefile           | 18 ++++--------------
 scripts/run-e2e.sh | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100755 scripts/run-e2e.sh

diff --git a/Makefile b/Makefile
index d706ca360..79c4ddd38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all e2e check-version docker-publish docker-publish-dev docker-tools dev dev-stop dev-start lint dep build test mock protobuf changelog clean genesis clean-build clean-docker clean-e2e
+.PHONY: all e2e check-version docker-publish docker-publish-dev docker-tools dev dev-stop dev-start lint dep build test mock protobuf changelog clean genesis clean-build clean-docker
 
 MAJOR_VERSION := $(shell echo $(version) | cut -d . -f 1)	
 MINOR_VERSION := $(shell echo $(version) | cut -d . -f 1-2)
@@ -51,15 +51,8 @@ dep:
 build: check-version dep
 	go build -mod=readonly -o ./bin/engine -ldflags="-X 'github.com/mesg-foundation/engine/version.Version=$(version)'" core/main.go
 
-e2e: export MESG_PATH = $(PWD)/e2e.test/mesg
-e2e: clean-e2e
-	# setup - copy config to MESG_PATH
-	mkdir -p $(MESG_PATH)
-	cp $(PWD)/e2e/testdata/e2e.config.yml $(MESG_PATH)/config.yml
-
-	@$(MAKE) dev-start
-	- go test -mod=readonly -v ./e2e/...
-	@$(MAKE) dev-stop
+e2e: docker-dev
+	./scripts/run-e2e.sh
 
 test: dep
 	go test -short -mod=readonly -v -coverprofile=coverage.txt ./...
@@ -76,9 +69,6 @@ protobuf: docker-tools
 changelog:
 	./scripts/changelog.sh $(milestone)
 
-clean-e2e:
-	- rm -rf $(PWD)/e2e.test/mesg
-
 clean-build:
 	- rm -rf bin/*
 
@@ -88,7 +78,7 @@ clean-docker:
 			mesg/engine:latest \
 			mesg/engine:dev 2>/dev/null
 
-clean: clean-e2e clean-build clean-docker
+clean: clean-build clean-docker
 
 genesis:
 	go run internal/tools/gen-genesis/main.go --path $(path) --chain-id $(chain-id) --validators $(validators)
diff --git a/scripts/run-e2e.sh b/scripts/run-e2e.sh
new file mode 100755
index 000000000..3e5e67d29
--- /dev/null
+++ b/scripts/run-e2e.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+MESG_PATH="$(pwd)"/e2e.test/mesg
+
+function onexit {
+  set +e
+  ./scripts/dev.sh stop
+  rm -r "${MESG_PATH}"
+}
+
+trap onexit EXIT
+
+mkdir -p "${MESG_PATH}"
+cp "$(pwd)"/e2e/testdata/e2e.config.yml "${MESG_PATH}"/config.yml
+
+./scripts/dev.sh -q
+
+go test -mod=readonly -v ./e2e/...