Skip to content

Commit

Permalink
Fixup a test for -f processing
Browse files Browse the repository at this point in the history
Thanks to @ahmetalpbalkan for noticing... we had an old check in this
testcase that no longer applied (due to stuff being removing recently).
However, while in there I added a check to make sure that the file referenced
by the query parameter isn't used at all.

Signed-off-by: Doug Davis <[email protected]>
  • Loading branch information
Doug Davis committed Mar 10, 2015
1 parent c5af44e commit a853f8e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion integration-cli/docker_api_containers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ func TestBuildApiDockerFileRemote(t *testing.T) {
server, err := fakeStorage(map[string]string{
"testD": `FROM busybox
COPY * /tmp/
RUN find / -name ba*
RUN find /tmp/`,
})
if err != nil {
Expand All @@ -369,9 +370,11 @@ RUN find /tmp/`,
t.Fatalf("Build failed: %s", err)
}

// Make sure Dockerfile exists.
// Make sure 'baz' doesn't exist ANYWHERE despite being mentioned in the URL
out := string(buf)
if !strings.Contains(out, "/tmp/Dockerfile") ||
strings.Contains(out, "/tmp/baz") {
strings.Contains(out, "baz") {
t.Fatalf("Incorrect output: %s", out)
}

Expand Down

0 comments on commit a853f8e

Please sign in to comment.