From 8ec2a142c93fb750f3c972a2a4c8ec09b1af2c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Fri, 5 May 2017 23:30:23 +0200 Subject: [PATCH] =?UTF-8?q?Enable=20tests=20for=20schema2=E2=86=92schema1?= =?UTF-8?q?=20conversion=20with=20docker/distribution=20registries?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we can update the embedded name:tag, the test no longer fails on a schema1→schema1 copy with the old schema1 server which verifies the name:tag value. --- integration/copy_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/integration/copy_test.go b/integration/copy_test.go index 13c3e5a4..43a4d4aa 100644 --- a/integration/copy_test.go +++ b/integration/copy_test.go @@ -572,13 +572,7 @@ func (s *CopySuite) TestCopySchemaConversion(c *check.C) { // Test conversion / schema autodetection both for the OpenShift embedded registry… s.testCopySchemaConversionRegistries(c, "docker://localhost:5005/myns/schema1", "docker://localhost:5006/myns/schema2") // … and for various docker/distribution registry versions. - if false { - // FIXME: This does not currently work, because the schema1-only docker/distribution registry we have (unlike newer versions) - // enforces that a schema1 manifest contains a matching tag field. Our _s2→s1 conversion_ code does set the tag correctly, - // but a mere copy of schema1→schema1 changing the tag does not update the manifest. - // So, enabling this test results in a successful schema2→schema1 conversion, followed by a schema1→schema1 copy failure. - s.testCopySchemaConversionRegistries(c, "docker://"+v2s1DockerRegistryURL+"/schema1", "docker://"+v2DockerRegistryURL+"/schema2") - } + s.testCopySchemaConversionRegistries(c, "docker://"+v2s1DockerRegistryURL+"/schema1", "docker://"+v2DockerRegistryURL+"/schema2") } func (s *CopySuite) testCopySchemaConversionRegistries(c *check.C, schema1Registry, schema2Registry string) {