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

builder: Add TODOBuildkit test requirement, specifically for TestBuildCancellationKillsSleep

Browse source 
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2018-05-16 00:11:25 +00:00 • committed by Tonis Tiigi
parent f6e58ca3c8
commit 60a911dfca
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
integration-cli/docker_cli_build_unix_test.go
View file

@ -126,8 +126,12 @@ func (s *DockerSuite) TestBuildAddChangeOwnership(c *check.C) {
// * Run a 1-year-long sleep from a docker build. // * Run a 1-year-long sleep from a docker build.
// * When docker events sees container start, close the "docker build" command // * When docker events sees container start, close the "docker build" command
// * Wait for docker events to emit a dying event. // * 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) { func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux, TODOBuildkit)
name := "testbuildcancellation" name := "testbuildcancellation"
observer, err := newEventObserver(c) observer, err := newEventObserver(c)

4
integration-cli/requirements_test.go
View file

@ -208,6 +208,10 @@ func SwarmInactive() bool {
return testEnv.DaemonInfo.Swarm.LocalNodeState == swarm.LocalNodeStateInactive return testEnv.DaemonInfo.Swarm.LocalNodeState == swarm.LocalNodeStateInactive
} }
func TODOBuildkit() bool {
return os.Getenv("DOCKER_BUILDKIT") == ""
}
// testRequires checks if the environment satisfies the requirements // testRequires checks if the environment satisfies the requirements
// for the test to run or skips the tests. // for the test to run or skips the tests.
func testRequires(c requirement.SkipT, requirements ...requirement.Test) { func testRequires(c requirement.SkipT, requirements ...requirement.Test) {