kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #26261 from Microsoft/jjh/morebuildtests

Browse source 
Windows CI: Enable some more build tests
This commit is contained in:
Brian Goff 2016-09-02 09:41:08 -04:00 • committed by GitHub
commit 84ebbb5231
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
integration-cli/docker_cli_build_test.go
View file

@ -2632,7 +2632,6 @@ func (s *DockerSuite) TestBuildAddCurrentDirWithoutCache(c *check.C) {
} }
func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) { func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildaddremotefilewithcache" name := "testbuildaddremotefilewithcache"
server, err := fakeStorage(map[string]string{ server, err := fakeStorage(map[string]string{
"baz": "hello", "baz": "hello",
@ -2643,7 +2642,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) {
defer server.Close() defer server.Close()
id1, err := buildImage(name, id1, err := buildImage(name,
fmt.Sprintf(`FROM scratch fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
true) true)
@ -2651,7 +2650,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) {
c.Fatal(err) c.Fatal(err)
} }
id2, err := buildImage(name, id2, err := buildImage(name,
fmt.Sprintf(`FROM scratch fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
true) true)
@ -2664,7 +2663,6 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) {
} }
func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) { func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildaddremotefilewithoutcache" name := "testbuildaddremotefilewithoutcache"
name2 := "testbuildaddremotefilewithoutcache2" name2 := "testbuildaddremotefilewithoutcache2"
server, err := fakeStorage(map[string]string{ server, err := fakeStorage(map[string]string{
@ -2676,7 +2674,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) {
defer server.Close() defer server.Close()
id1, err := buildImage(name, id1, err := buildImage(name,
fmt.Sprintf(`FROM scratch fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
true) true)
@ -2684,7 +2682,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) {
c.Fatal(err) c.Fatal(err)
} }
id2, err := buildImage(name2, id2, err := buildImage(name2,
fmt.Sprintf(`FROM scratch fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
false) false)
@ -2697,7 +2695,6 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) {
} }
func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) { func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildaddremotefilemtime" name := "testbuildaddremotefilemtime"
name2 := name + "2" name2 := name + "2"
name3 := name + "3" name3 := name + "3"
@ -2709,7 +2706,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
} }
defer server.Close() defer server.Close()
ctx, err := fakeContext(fmt.Sprintf(`FROM scratch ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server.URL()), nil) ADD %s/baz /usr/lib/baz/quux`, server.URL()), nil)
if err != nil { if err != nil {
@ -2742,7 +2739,7 @@ func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
} }
defer server2.Close() defer server2.Close()
ctx2, err := fakeContext(fmt.Sprintf(`FROM scratch ctx2, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD %s/baz /usr/lib/baz/quux`, server2.URL()), nil) ADD %s/baz /usr/lib/baz/quux`, server2.URL()), nil)
if err != nil { if err != nil {
@ -2759,7 +2756,6 @@ func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
} }
func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithCache(c *check.C) { func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithCache(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildaddlocalandremotefilewithcache" name := "testbuildaddlocalandremotefilewithcache"
server, err := fakeStorage(map[string]string{ server, err := fakeStorage(map[string]string{
"baz": "hello", "baz": "hello",
@ -2769,7 +2765,7 @@ func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithCache(c *check.C) {
} }
defer server.Close() defer server.Close()
ctx, err := fakeContext(fmt.Sprintf(`FROM scratch ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD foo /usr/lib/bla/bar ADD foo /usr/lib/bla/bar
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
@ -2844,7 +2840,6 @@ func (s *DockerSuite) TestBuildNoContext(c *check.C) {
// TODO: TestCaching // TODO: TestCaching
func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) { func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildaddlocalandremotefilewithoutcache" name := "testbuildaddlocalandremotefilewithoutcache"
name2 := "testbuildaddlocalandremotefilewithoutcache2" name2 := "testbuildaddlocalandremotefilewithoutcache2"
server, err := fakeStorage(map[string]string{ server, err := fakeStorage(map[string]string{
@ -2855,7 +2850,7 @@ func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) {
} }
defer server.Close() defer server.Close()
ctx, err := fakeContext(fmt.Sprintf(`FROM scratch ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
MAINTAINER dockerio MAINTAINER dockerio
ADD foo /usr/lib/bla/bar ADD foo /usr/lib/bla/bar
ADD %s/baz /usr/lib/baz/quux`, server.URL()), ADD %s/baz /usr/lib/baz/quux`, server.URL()),
@ -2875,7 +2870,7 @@ func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) {
c.Fatal(err) c.Fatal(err)
} }
if id1 == id2 { if id1 == id2 {
c.Fatal("The cache should have been invalided but hasn't.") c.Fatal("The cache should have been invalidated but hasn't.")
} }
} }