From 60a911dfcab2304825e4e8f53999866cfc42d4d8 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Wed, 16 May 2018 00:11:25 +0000 Subject: [PATCH] builder: Add TODOBuildkit test requirement, specifically for TestBuildCancellationKillsSleep Signed-off-by: Tibor Vass --- integration-cli/docker_cli_build_unix_test.go | 6 +++++- integration-cli/requirements_test.go | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index d6c4370064..4b313f95c1 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -126,8 +126,12 @@ func (s *DockerSuite) TestBuildAddChangeOwnership(c *check.C) { // * Run a 1-year-long sleep from a docker build. // * When docker events sees container start, close the "docker build" command // * Wait for docker events to emit a dying event. +// +// TODO(buildkit): this test needs to be rewritten for buildkit. +// It has been manually tested positive. Confirmed issue: docker build output parsing. +// Potential issue: newEventObserver uses docker events, which is not hooked up to buildkit. func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) { - testRequires(c, DaemonIsLinux) + testRequires(c, DaemonIsLinux, TODOBuildkit) name := "testbuildcancellation" observer, err := newEventObserver(c) diff --git a/integration-cli/requirements_test.go b/integration-cli/requirements_test.go index 9b08a63b0e..e6038edb18 100644 --- a/integration-cli/requirements_test.go +++ b/integration-cli/requirements_test.go @@ -208,6 +208,10 @@ func SwarmInactive() bool { return testEnv.DaemonInfo.Swarm.LocalNodeState == swarm.LocalNodeStateInactive } +func TODOBuildkit() bool { + return os.Getenv("DOCKER_BUILDKIT") == "" +} + // testRequires checks if the environment satisfies the requirements // for the test to run or skips the tests. func testRequires(c requirement.SkipT, requirements ...requirement.Test) {