From cfca3255a83c7cbaeaa623617bf71688723b21aa Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 27 May 2016 15:38:29 -0700 Subject: [PATCH] Split the Seccomp tests into two The Seccomp tests ran 11 tests in parallel and this appears to be hitting some sort of bug on CI. Splitting into two tests means that I can no longer repeoduce the failure on the slow laptop where I could reproduce the failures before. Obviously this does not fix the underlying issue, which I will continue to investigate, but not having the tests failing a lot before the freeze for 1.12 would be rather helpful. Signed-off-by: Justin Cormack --- integration-cli/docker_cli_run_unix_test.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 7b98a87c95..ffb21b7f4f 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -1032,12 +1032,12 @@ func (s *DockerSuite) TestRunSeccompAllowSetrlimit(c *check.C) { } } -func (s *DockerSuite) TestRunSeccompDefaultProfile(c *check.C) { +func (s *DockerSuite) TestRunSeccompDefaultProfileAcct(c *check.C) { testRequires(c, SameHostDaemon, seccompEnabled, NotUserNamespace) var group sync.WaitGroup - group.Add(11) - errChan := make(chan error, 11) + group.Add(5) + errChan := make(chan error, 5) go func() { out, _, err := dockerCmdWithError("run", "syscall-test", "acct-test") if err == nil || !strings.Contains(out, "Operation not permitted") { @@ -1078,6 +1078,21 @@ func (s *DockerSuite) TestRunSeccompDefaultProfile(c *check.C) { group.Done() }() + group.Wait() + close(errChan) + + for err := range errChan { + c.Assert(err, checker.IsNil) + } +} + +func (s *DockerSuite) TestRunSeccompDefaultProfileNS(c *check.C) { + testRequires(c, SameHostDaemon, seccompEnabled, NotUserNamespace) + + var group sync.WaitGroup + group.Add(6) + errChan := make(chan error, 6) + go func() { out, _, err := dockerCmdWithError("run", "syscall-test", "ns-test", "echo", "hello0") if err == nil || !strings.Contains(out, "Operation not permitted") {