Skip to content

Fix broken TestImageInspectDifferentValidReferencesForTheSameImage #3483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Oct 2, 2024
Merged

Fix broken TestImageInspectDifferentValidReferencesForTheSameImage #3483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions cmd/nerdctl/image/image_inspect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package image

import (
"encoding/json"
"runtime"
"strings"
"testing"

Expand Down Expand Up @@ -71,16 +70,12 @@ func TestImageInspectSimpleCases(t *testing.T) {
func TestImageInspectDifferentValidReferencesForTheSameImage(t *testing.T) {
nerdtest.Setup()

platform := runtime.GOOS + "/" + runtime.GOARCH
Copy link
Copy Markdown
Contributor Author

@apostasie apostasie Oct 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Earlier version of this test was using linux/amd64, because it was hardcoding the sha.
When I rewrote the test a few weeks ago, I removed the static sha and replaced by a lookup, allowing to use whatever platform - though I did not remove the platform mechanism itself for some reason.
It is unnecesary.


tags := []string{
"",
":latest",
":stable",
}
names := []string{
"busybox",
"library/busybox",
"docker.io/library/busybox",
"registry-1.docker.io/library/busybox",
}
Expand All @@ -94,11 +89,9 @@ func TestImageInspectDifferentValidReferencesForTheSameImage(t *testing.T) {
nerdtest.Private,
),
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("pull", "alpine", "--platform", platform)
helpers.Ensure("pull", "busybox", "--platform", platform)
helpers.Ensure("pull", "busybox:stable", "--platform", platform)
helpers.Ensure("pull", "registry-1.docker.io/library/busybox", "--platform", platform)
helpers.Ensure("pull", "registry-1.docker.io/library/busybox:stable", "--platform", platform)
Comment thread
apostasie marked this conversation as resolved.
helpers.Ensure("pull", "alpine")
helpers.Ensure("pull", "busybox")
helpers.Ensure("pull", "registry-1.docker.io/library/busybox")
},
SubTests: []*test.Case{
{
Expand Down Expand Up @@ -150,9 +143,11 @@ func TestImageInspectDifferentValidReferencesForTheSameImage(t *testing.T) {

// Demonstrate image name precedence over digest lookup
// Using the shortened sha should no longer get busybox, but rather the newly tagged Alpine
// FIXME: this is triggering https://github.com/containerd/nerdctl/issues/3016
// We cannot get rid of that image now, which does break local testing
helpers.Ensure("tag", "alpine", sha[0:8])
it := nerdtest.InspectImage(helpers, sha[0:8])
assert.Equal(t, it.ID, alpine.ID, alpine.ID+" vs "+it.ID)
assert.Equal(t, it.ID, alpine.ID)
},
}
},
Expand Down Expand Up @@ -202,18 +197,17 @@ func TestImageInspectDifferentValidReferencesForTheSameImage(t *testing.T) {
},
{
Description: "retrieving multiple entries at once",
Command: test.RunCommand("image", "inspect", "busybox", "busybox", "busybox:stable"),
Command: test.RunCommand("image", "inspect", "busybox", "busybox"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Output: func(stdout string, info string, t *testing.T) {
var dc []dockercompat.Image
err := json.Unmarshal([]byte(stdout), &dc)
assert.NilError(t, err, "Unable to unmarshal output\n"+info)
assert.Equal(t, 3, len(dc), "Unexpectedly did not get 3 results\n"+info)
assert.Equal(t, 2, len(dc), "Unexpectedly did not get 2 results\n"+info)
reference := nerdtest.InspectImage(helpers, "busybox")
assert.Equal(t, dc[0].ID, reference.ID)
assert.Equal(t, dc[1].ID, reference.ID)
assert.Equal(t, dc[2].ID, reference.ID)
},
}
},
Expand Down