From 3de433ea4af28ef7b3bb97747fe50dc84def3cd5 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 2 Feb 2016 13:51:10 +0100 Subject: [PATCH] re-enable and fix failing tests Signed-off-by: Antonio Murdaca --- integration/check_test.go | 40 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/integration/check_test.go b/integration/check_test.go index 0eda2265..1c46d5f1 100644 --- a/integration/check_test.go +++ b/integration/check_test.go @@ -81,31 +81,23 @@ func (s *SkopeoSuite) TestVersion(c *check.C) { } } -//func (s *SkopeoSuite) TestCanAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) { -//out, err := exec.Command(skopeoBinary, "--docker-cfg=''", "--username="+s.regV2WithAuth.username, "--password="+s.regV2WithAuth.password, fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput() -//c.Assert(err, check.NotNil, check.Commentf(string(out))) -//wanted := "falling back to --username and --password if needed" -//if !strings.Contains(string(out), wanted) { -//c.Fatalf("wanted %s, got %s", wanted, string(out)) -//} -//wanted = "Error: image busybox not found" -//if !strings.Contains(string(out), wanted) { -//c.Fatalf("wanted %s, got %s", wanted, string(out)) -//} -//} +func (s *SkopeoSuite) TestCanAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) { + out, err := exec.Command(skopeoBinary, "--docker-cfg=''", "--username="+s.regV2WithAuth.username, "--password="+s.regV2WithAuth.password, fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput() + c.Assert(err, check.NotNil, check.Commentf(string(out))) + wanted := "Error: image busybox not found" + if !strings.Contains(string(out), wanted) { + c.Fatalf("wanted %s, got %s", wanted, string(out)) + } +} -//func (s *SkopeoSuite) TestNeedAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) { -//out, err := exec.Command(skopeoBinary, "--docker-cfg=''", fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput() -//c.Assert(err, check.NotNil, check.Commentf(string(out))) -//wanted := "falling back to --username and --password if needed" -//if !strings.Contains(string(out), wanted) { -//c.Fatalf("wanted %s, got %s", wanted, string(out)) -//} -//wanted = "no basic auth credentials" -//if !strings.Contains(string(out), wanted) { -//c.Fatalf("wanted %s, got %s", wanted, string(out)) -//} -//} +func (s *SkopeoSuite) TestNeedAuthToPrivateRegistryV2WithoutDockerCfg(c *check.C) { + out, err := exec.Command(skopeoBinary, "--docker-cfg=''", fmt.Sprintf("%s/busybox:latest", s.regV2WithAuth.url)).CombinedOutput() + c.Assert(err, check.NotNil, check.Commentf(string(out))) + wanted := "no basic auth credentials" + if !strings.Contains(string(out), wanted) { + c.Fatalf("wanted %s, got %s", wanted, string(out)) + } +} // TODO(runcom): as soon as we can push to registries ensure you can inspect here // not just get image not found :)