Merge pull request moby#30893 from Microsoft/jjh/disabletesttemporarily

justincormack · thaJeztah · commit 4122443aa779 · 2017-02-17T22:04:23.000-08:00
Windows: Temporarily disable TestBuildLastModified (cherry picked from commit eaffb30) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
@@ -531,6 +531,10 @@ func (s *DockerSuite) TestBuildCacheAdd(c *check.C) {
 }
 
 func (s *DockerSuite) TestBuildLastModified(c *check.C) {
+	// Temporary fix for #30890. TODO @jhowardmsft figure out what
+	// has changed in the master busybox image.
+	testRequires(c, DaemonIsLinux)
+
 	name := "testbuildlastmodified"
 
 	server, err := fakeStorage(map[string]string{
@@ -3647,6 +3651,7 @@ RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1042:1043/10
 	}
 }
 
+// FIXME(vdemeester) rename this test (and probably "merge" it with the one below TestBuildEnvUsage2)
 func (s *DockerSuite) TestBuildEnvUsage(c *check.C) {
 	// /docker/world/hello is not owned by the correct user
 	testRequires(c, NotUserNamespace)
@@ -3685,6 +3690,7 @@ RUN    [ "$ghi" = "def" ]
 	}
 }
 
+// FIXME(vdemeester) rename this test (and probably "merge" it with the one above TestBuildEnvUsage)
 func (s *DockerSuite) TestBuildEnvUsage2(c *check.C) {
 	// /docker/world/hello is not owned by the correct user
 	testRequires(c, NotUserNamespace)
@@ -4811,6 +4817,7 @@ CMD cat /foo/file`,
 
 }
 
+// FIXME(vdemeester) part of this should be unit test, other part should be clearer
 func (s *DockerSuite) TestBuildRenamedDockerfile(c *check.C) {
 
 	ctx, err := fakeContext(`FROM busybox

Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,10 @@ func (s DockerSuite) TestBuildCacheAdd(c check.C) {`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`func (s DockerSuite) TestBuildLastModified(c check.C) {`
	`534`	`+ // Temporary fix for #30890. TODO @jhowardmsft figure out what`
	`535`	`+ // has changed in the master busybox image.`
	`536`	`+ testRequires(c, DaemonIsLinux)`
	`537`	`+`
`534`	`538`	`name := "testbuildlastmodified"`
`535`	`539`
`536`	`540`	`server, err := fakeStorage(map[string]string{`
`@@ -3647,6 +3651,7 @@ RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1042:1043/10`
`3647`	`3651`	`}`
`3648`	`3652`	`}`
`3649`	`3653`
	`3654`	`+// FIXME(vdemeester) rename this test (and probably "merge" it with the one below TestBuildEnvUsage2)`
`3650`	`3655`	`func (s DockerSuite) TestBuildEnvUsage(c check.C) {`
`3651`	`3656`	`// /docker/world/hello is not owned by the correct user`
`3652`	`3657`	`testRequires(c, NotUserNamespace)`
`@@ -3685,6 +3690,7 @@ RUN [ "$ghi" = "def" ]`
`3685`	`3690`	`}`
`3686`	`3691`	`}`
`3687`	`3692`
	`3693`	`+// FIXME(vdemeester) rename this test (and probably "merge" it with the one above TestBuildEnvUsage)`
`3688`	`3694`	`func (s DockerSuite) TestBuildEnvUsage2(c check.C) {`
`3689`	`3695`	`// /docker/world/hello is not owned by the correct user`
`3690`	`3696`	`testRequires(c, NotUserNamespace)`
@@ -4811,6 +4817,7 @@ CMD cat /foo/file`,
`4811`	`4817`
`4812`	`4818`	`}`
`4813`	`4819`
	`4820`	`+// FIXME(vdemeester) part of this should be unit test, other part should be clearer`
`4814`	`4821`	`func (s DockerSuite) TestBuildRenamedDockerfile(c check.C) {`
`4815`	`4822`
`4816`	`4823`	ctx, err := fakeContext(`FROM busybox