From 9d7b9c23f54a082b1aa2f1206473adc1a266fb0a Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 29 Sep 2017 16:17:10 -0700 Subject: [PATCH 1/2] Blacklist tests, will be rewritten later on Signed-off-by: Eli Uriegas (cherry picked from commit 4e81e4fa4edce70d1ce4e96c2181fcdfb88241bb) Signed-off-by: Riyaz Faizullabhoy (cherry picked from commit ec6b0a1a4a2e0d48f7338080f76b47fc3b022c74) Signed-off-by: Andrew Hsu (cherry picked from commit fbfecebc0a5a2c75212b2c2d2b53a00255ce479e) Signed-off-by: Andrew Hsu (cherry picked from commit e3571070d5502ac07e6c8a56867e21b2cfa3ae07) Signed-off-by: Andrew Hsu --- components/engine/integration-cli/docker_cli_build_test.go | 2 ++ .../engine/integration-cli/docker_cli_pull_trusted_test.go | 2 ++ components/engine/integration-cli/docker_cli_push_test.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index dda77c94a12..32f182ef6ef 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -4228,6 +4228,7 @@ func (s *DockerTrustSuite) TestBuildContextDirIsSymlink(c *check.C) { } func (s *DockerTrustSuite) TestTrustedBuildTagFromReleasesRole(c *check.C) { + c.Skip("Blacklisting for Docker CE") testRequires(c, NotaryHosting) latestTag := s.setupTrustedImage(c, "trusted-build-releases-role") @@ -4259,6 +4260,7 @@ func (s *DockerTrustSuite) TestTrustedBuildTagFromReleasesRole(c *check.C) { } func (s *DockerTrustSuite) TestTrustedBuildTagIgnoresOtherDelegationRoles(c *check.C) { + c.Skip("Blacklisting for Docker CE") testRequires(c, NotaryHosting) latestTag := s.setupTrustedImage(c, "trusted-build-releases-role") diff --git a/components/engine/integration-cli/docker_cli_pull_trusted_test.go b/components/engine/integration-cli/docker_cli_pull_trusted_test.go index 60e1c3db1d0..49402fe9ab6 100644 --- a/components/engine/integration-cli/docker_cli_pull_trusted_test.go +++ b/components/engine/integration-cli/docker_cli_pull_trusted_test.go @@ -133,6 +133,7 @@ func (s *DockerTrustSuite) TestTrustedPullDelete(c *check.C) { } func (s *DockerTrustSuite) TestTrustedPullReadsFromReleasesRole(c *check.C) { + c.Skip("Blacklisting for Docker CE") testRequires(c, NotaryHosting) repoName := fmt.Sprintf("%v/dockerclireleasesdelegationpulling/trusted", privateRegistryURL) targetName := fmt.Sprintf("%s:latest", repoName) @@ -188,6 +189,7 @@ func (s *DockerTrustSuite) TestTrustedPullReadsFromReleasesRole(c *check.C) { } func (s *DockerTrustSuite) TestTrustedPullIgnoresOtherDelegationRoles(c *check.C) { + c.Skip("Blacklisting for Docker CE") testRequires(c, NotaryHosting) repoName := fmt.Sprintf("%v/dockerclipullotherdelegation/trusted", privateRegistryURL) targetName := fmt.Sprintf("%s:latest", repoName) diff --git a/components/engine/integration-cli/docker_cli_push_test.go b/components/engine/integration-cli/docker_cli_push_test.go index 94efa08eabb..b602cb849bd 100644 --- a/components/engine/integration-cli/docker_cli_push_test.go +++ b/components/engine/integration-cli/docker_cli_push_test.go @@ -282,6 +282,7 @@ func (s *DockerSchema1RegistrySuite) TestCrossRepositoryLayerPushNotSupported(c } func (s *DockerTrustSuite) TestTrustedPush(c *check.C) { + c.Skip("Blacklisting for Docker CE") repoName := fmt.Sprintf("%v/dockerclitrusted/pushtest:latest", privateRegistryURL) // tag the image and upload it to the private registry cli.DockerCmd(c, "tag", "busybox", repoName) @@ -366,6 +367,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithExistingSignedTag(c *check.C) { } func (s *DockerTrustSuite) TestTrustedPushWithIncorrectPassphraseForNonRoot(c *check.C) { + c.Skip("Blacklisting for Docker CE") repoName := fmt.Sprintf("%v/dockercliincorretpwd/trusted:latest", privateRegistryURL) // tag the image and upload it to the private registry cli.DockerCmd(c, "tag", "busybox", repoName) From 1a2098cecfcdf93f3d8b8e203ffb6480973b172f Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 30 Oct 2017 10:48:48 +0100 Subject: [PATCH 2/2] update integration-cli tests for stderr output Signed-off-by: Riyaz Faizullabhoy (cherry picked from commit 250b84ee8820d5ac28f223ef3affdffeff7ee026) Signed-off-by: Andrew Hsu (cherry picked from commit d256539bf422fe6dc84c720c9153823c05396a3e) Signed-off-by: Andrew Hsu (cherry picked from commit 5742bd3ccf41601e363cd0bc8d8e45cd54973eed) Signed-off-by: Andrew Hsu --- components/engine/integration-cli/trust_server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration-cli/trust_server_test.go b/components/engine/integration-cli/trust_server_test.go index 19abe871960..39e7c0717e1 100644 --- a/components/engine/integration-cli/trust_server_test.go +++ b/components/engine/integration-cli/trust_server_test.go @@ -41,7 +41,7 @@ const notaryHost = "localhost:4443" const notaryURL = "https://" + notaryHost var SuccessTagging = icmd.Expected{ - Out: "Tagging", + Err: "Tagging", } var SuccessSigningAndPushing = icmd.Expected{