From 7d6ef4d338b3a498a957c9836b3f649215ecfaf3 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Sat, 7 Oct 2017 17:55:38 -0300
Subject: [PATCH] chore: improved docker test code

using defer and added a log
---
 .travis.yml                    | 2 +-
 pipeline/docker/docker_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa524f05e..e03579e93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ script:
   - test -n "$TRAVIS_TAG" || go run main.go --skip-validate --skip-publish
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+  - test -n "$TRAVIS_TAG" && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
   - test -n "$TRAVIS_TAG" && go run main.go
 notifications:
   email: false
diff --git a/pipeline/docker/docker_test.go b/pipeline/docker/docker_test.go
index 7b7237a5f..0e2e74003 100644
--- a/pipeline/docker/docker_test.go
+++ b/pipeline/docker/docker_test.go
@@ -17,6 +17,7 @@ import (
 )
 
 func killAndRm() {
+	log.Info("killing registry")
 	_ = exec.Command("docker", "kill", "registry").Run()
 	_ = exec.Command("docker", "rm", "registry").Run()
 }
@@ -24,13 +25,12 @@ func killAndRm() {
 func TestMain(m *testing.M) {
 	killAndRm()
 	if err := exec.Command(
-		"docker", "run", "-d", "-p", "5000:5000", "--restart=always", "--name", "registry", "registry:2",
+		"docker", "run", "-d", "-p", "5000:5000", "--name", "registry", "registry:2",
 	).Run(); err != nil {
 		log.WithError(err).Fatal("failed to start docker registry")
 	}
-	code := m.Run()
-	killAndRm()
-	os.Exit(code)
+	defer killAndRm()
+	os.Exit(m.Run())
 }
 
 func TestRunPipe(t *testing.T) {