From fbe9d5d3780695ab1275608586723f60d8fe4be7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Apr 2018 11:51:37 -0700 Subject: [PATCH] Revert "Blacklist tests, will be rewritten later on" This reverts commit a720337d2e359f9215422b47c9ef66421d582f24. Signed-off-by: Sebastiaan van Stijn --- 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 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 335aaed706..fc2dafe411 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -4120,7 +4120,6 @@ 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") @@ -4152,7 +4151,6 @@ 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 49402fe9ab..60e1c3db1d 100644 --- a/components/engine/integration-cli/docker_cli_pull_trusted_test.go +++ b/components/engine/integration-cli/docker_cli_pull_trusted_test.go @@ -133,7 +133,6 @@ 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) @@ -189,7 +188,6 @@ 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 b602cb849b..94efa08eab 100644 --- a/components/engine/integration-cli/docker_cli_push_test.go +++ b/components/engine/integration-cli/docker_cli_push_test.go @@ -282,7 +282,6 @@ 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) @@ -367,7 +366,6 @@ 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)