mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-29 07:21:35 +03:00
Code Activity

Merge pull request #11278 from ahmetalpbalkan/win-cli/fakeGIT

Browse Source 
integ-cli: use httpserver container for fakeGIT
This commit is contained in:
Jessie Frazelle
2015-03-11 18:19:11 -07:00
parent 5494432f91 44ffb199d0
commit 52f6da2238
3 changed files with 90 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
integration-cli/docker_api_containers_test.go
View File

@ -385,7 +385,7 @@ func TestBuildApiLowerDockerfile(t *testing.T) {
git, err := fakeGIT("repo", map[string]string{
"dockerfile": `FROM busybox
RUN echo from dockerfile`,
})
}, false)
if err != nil {
t.Fatal(err)
}
@ -410,7 +410,7 @@ func TestBuildApiBuildGitWithF(t *testing.T) {
RUN echo from baz`,
"Dockerfile": `FROM busybox
RUN echo from Dockerfile`,
})
}, false)
if err != nil {
t.Fatal(err)
}
@ -431,12 +431,13 @@ RUN echo from Dockerfile`,
}
func TestBuildApiDoubleDockerfile(t *testing.T) {
testRequires(t, UnixCli) // dockerfile overwrites Dockerfile on Windows
git, err := fakeGIT("repo", map[string]string{
"Dockerfile": `FROM busybox
RUN echo from Dockerfile`,
"dockerfile": `FROM busybox
RUN echo from dockerfile`,
})
}, false)
if err != nil {
t.Fatal(err)
}