summaryrefslogtreecommitdiff
path: root/docker/compiler_test.go
diff options
context:
space:
mode:
authorTyler Cipriani <tcipriani@wikimedia.org>2017-09-14 16:57:25 -0600
committerTyler Cipriani <tcipriani@wikimedia.org>2017-10-10 12:16:58 -0600
commit01f3533a0b4819ce868d4f89c83a090eae6cfd08 (patch)
treeeff099425ba495b56312a4b0eb0e466758386b2c /docker/compiler_test.go
parent8ff4d41552d527eec484a07b76d764e52559e340 (diff)
downloadblubber-01f3533a0b4819ce868d4f89c83a090eae6cfd08.tar.gz
Move error handling to main
Summary: Rather than calling `log.Fatal` in `Compile` bubble the error up to `main` and handle it there. Test Plan: go test ./... Reviewers: dduvall, #release-engineering-team Reviewed By: dduvall, #release-engineering-team Tags: #release-engineering-team Differential Revision: https://phabricator.wikimedia.org/D784
Diffstat (limited to 'docker/compiler_test.go')
-rw-r--r--docker/compiler_test.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/compiler_test.go b/docker/compiler_test.go
index ea5009d..04454b4 100644
--- a/docker/compiler_test.go
+++ b/docker/compiler_test.go
@@ -18,7 +18,8 @@ func TestSingleStageHasNoName(t *testing.T) {
assert.Nil(t, err)
- dockerfile := docker.Compile(cfg, "development").String()
+ dockerOut, _ := docker.Compile(cfg, "development")
+ dockerfile := dockerOut.String()
assert.Contains(t, dockerfile, "FROM foo/bar\n")
}
@@ -36,7 +37,8 @@ func TestMultiStageIncludesStageNames(t *testing.T) {
assert.Nil(t, err)
- dockerfile := docker.Compile(cfg, "production").String()
+ dockerOut, _ := docker.Compile(cfg, "production")
+ dockerfile := dockerOut.String()
assert.Contains(t, dockerfile, "FROM foo/bar AS build\n")
assert.Contains(t, dockerfile, "FROM foo/bar AS production\n")
@@ -61,7 +63,8 @@ func TestMultipleArtifactsFromSameStage(t *testing.T) {
assert.Nil(t, err)
- dockerfile := docker.Compile(cfg, "production").String()
+ dockerOut, _ := docker.Compile(cfg, "production")
+ dockerfile := dockerOut.String()
assert.Contains(t, dockerfile, "FROM foo/bar AS build\n")
assert.Contains(t, dockerfile, "FROM foo/bar AS production\n")