From d364d41e1b1cf42d11b383fb02fbaa07e8b156f7 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 21 Mar 2018 13:08:32 -0500 Subject: Removing tagged images change in behavior An image name is really just a tag. When an image has multiple tags, we should be able to "delete" the one of its tags without harm. In this case, the "delete' is really a form of Untag (removing the tag from the image). If an image has multiple tags and the user tries to delete by ID without force, this should be denied because when you delete by ID there is no distinguishing it like image tags. Signed-off-by: baude Closes: #528 Approved by: mheon --- libpod/image/image_test.go | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'libpod/image/image_test.go') diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go index d9e8987a6..5c7cc191d 100644 --- a/libpod/image/image_test.go +++ b/libpod/image/image_test.go @@ -136,3 +136,52 @@ func TestImage_New(t *testing.T) { // Shutdown the runtime and remove the temporary storage cleanup(workdir, ir) } + +// TestImage_MatchRepoTag tests the various inputs we need to match +// against an image's reponames +func TestImage_MatchRepoTag(t *testing.T) { + //Set up + workdir, err := mkWorkDir() + assert.NoError(t, err) + + so := storage.StoreOptions{ + RunRoot: workdir, + GraphRoot: workdir, + } + ir, err := NewImageRuntimeFromOptions(so) + assert.NoError(t, err) + newImage, err := ir.New("busybox", "", "", os.Stdout, nil, SigningOptions{}) + assert.NoError(t, err) + err = newImage.TagImage("foo:latest") + assert.NoError(t, err) + err = newImage.TagImage("foo:bar") + assert.NoError(t, err) + + // Tests start here. + for _, name := range bbNames { + repoTag, err := newImage.MatchRepoTag(name) + assert.NoError(t, err) + assert.Equal(t, "docker.io/library/busybox:latest", repoTag) + } + + // Test against tagged images of busybox + // foo should resolve to foo:latest + repoTag, err := newImage.MatchRepoTag("foo") + assert.NoError(t, err) + assert.Equal(t, "foo:latest", repoTag) + + // foo:bar should resolve to foo:bar + repoTag, err = newImage.MatchRepoTag("foo:bar") + assert.NoError(t, err) + assert.Equal(t, "foo:bar", repoTag) + // Shutdown the runtime and remove the temporary storage + cleanup(workdir, ir) +} + +// Test_splitString tests the splitString function in image that +// takes input and splits on / and returns the last array item +func Test_splitString(t *testing.T) { + assert.Equal(t, splitString("foo/bar"), "bar") + assert.Equal(t, splitString("a/foo/bar"), "bar") + assert.Equal(t, splitString("bar"), "bar") +} -- cgit v1.2.3-54-g00ecf