From 4122443aa779f94448c00a904ab13815ae9ee67a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Feb 2017 11:38:56 +0000 Subject: [PATCH] Merge pull request #30893 from Microsoft/jjh/disabletesttemporarily Windows: Temporarily disable TestBuildLastModified (cherry picked from commit eaffb3099a4ed2701fc0934b39b7dcdd1ca62219) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_build_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 49c1062c25..41470f9777 100644 --- 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