diff --git a/integration/check_test.go b/integration/check_test.go index 26080b75..4517bb55 100644 --- a/integration/check_test.go +++ b/integration/check_test.go @@ -12,9 +12,6 @@ import ( const ( privateRegistryURL0 = "127.0.0.1:5000" privateRegistryURL1 = "127.0.0.1:5001" - privateRegistryURL2 = "127.0.0.1:5002" - privateRegistryURL3 = "127.0.0.1:5003" - privateRegistryURL4 = "127.0.0.1:5004" ) func Test(t *testing.T) { @@ -26,10 +23,7 @@ func init() { } type SkopeoSuite struct { - regV1 *testRegistryV1 regV2 *testRegistryV2 - regV2Shema1 *testRegistryV2 - regV1WithAuth *testRegistryV1 // does v1 support auth? regV2WithAuth *testRegistryV2 } @@ -43,21 +37,14 @@ func (s *SkopeoSuite) TearDownSuite(c *check.C) { } func (s *SkopeoSuite) SetUpTest(c *check.C) { - s.regV1 = setupRegistryV1At(c, privateRegistryURL0, false) // TODO:(runcom) - s.regV2 = setupRegistryV2At(c, privateRegistryURL1, false, false) - s.regV2Shema1 = setupRegistryV2At(c, privateRegistryURL2, false, true) - s.regV1WithAuth = setupRegistryV1At(c, privateRegistryURL3, true) // not used - s.regV2WithAuth = setupRegistryV2At(c, privateRegistryURL4, true, false) + s.regV2 = setupRegistryV2At(c, privateRegistryURL0, false, false) + s.regV2WithAuth = setupRegistryV2At(c, privateRegistryURL1, true, false) } func (s *SkopeoSuite) TearDownTest(c *check.C) { - // not checking V1 registries now... if s.regV2 != nil { s.regV2.Close() } - if s.regV2Shema1 != nil { - s.regV2Shema1.Close() - } if s.regV2WithAuth != nil { //cmd := exec.Command("docker", "logout", s.regV2WithAuth) //c.Assert(cmd.Run(), check.IsNil)