summaryrefslogtreecommitdiff
path: root/build/instructions_test.go
diff options
context:
space:
mode:
authorTyler Cipriani <tcipriani@wikimedia.org>2018-07-19 10:26:20 -0600
committerTyler Cipriani <tcipriani@wikimedia.org>2018-07-26 11:20:28 -0600
commitaba163aa5a762a497a5b7a0f1a43fb756c916d64 (patch)
treebd213d500e72a2a74f69f2fdc38756f4c1adc41e /build/instructions_test.go
parent2b87c9a345da18ed408fd0d031068beb0c46adff (diff)
downloadblubber-aba163aa5a762a497a5b7a0f1a43fb756c916d64.tar.gz
Add slash to directory path if copying > 1 file
Summary: Ran into a Docker error when attempting to build a node project with more than one requirements files: When using COPY with more than one source file, the destination must be a directory and end with a / Reviewers: dduvall, #release-engineering-team Reviewed By: dduvall, #release-engineering-team Tags: #release-engineering-team Differential Revision: https://phabricator.wikimedia.org/D1080
Diffstat (limited to 'build/instructions_test.go')
-rw-r--r--build/instructions_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/instructions_test.go b/build/instructions_test.go
index 77938dd..561bf80 100644
--- a/build/instructions_test.go
+++ b/build/instructions_test.go
@@ -33,7 +33,7 @@ func TestRunAll(t *testing.T) {
func TestCopy(t *testing.T) {
i := build.Copy{[]string{"source1", "source2"}, "dest"}
- assert.Equal(t, []string{`"source1"`, `"source2"`, `"dest"`}, i.Compile())
+ assert.Equal(t, []string{`"source1"`, `"source2"`, `"dest/"`}, i.Compile())
}
func TestCopyAs(t *testing.T) {
@@ -44,7 +44,7 @@ func TestCopyAs(t *testing.T) {
build.Copy{[]string{"source1", "source2"}, "dest"},
}
- assert.Equal(t, []string{"123:124", `"source1"`, `"source2"`, `"dest"`}, i.Compile())
+ assert.Equal(t, []string{"123:124", `"source1"`, `"source2"`, `"dest/"`}, i.Compile())
})
t.Run("wrapping CopyFrom", func(t *testing.T) {
@@ -54,14 +54,14 @@ func TestCopyAs(t *testing.T) {
build.CopyFrom{"foo", build.Copy{[]string{"source1", "source2"}, "dest"}},
}
- assert.Equal(t, []string{"123:124", "foo", `"source1"`, `"source2"`, `"dest"`}, i.Compile())
+ assert.Equal(t, []string{"123:124", "foo", `"source1"`, `"source2"`, `"dest/"`}, i.Compile())
})
}
func TestCopyFrom(t *testing.T) {
i := build.CopyFrom{"foo", build.Copy{[]string{"source1", "source2"}, "dest"}}
- assert.Equal(t, []string{"foo", `"source1"`, `"source2"`, `"dest"`}, i.Compile())
+ assert.Equal(t, []string{"foo", `"source1"`, `"source2"`, `"dest/"`}, i.Compile())
}
func TestEntryPoint(t *testing.T) {