Merge pull request #50257 from thaJeztah/TestCreateByImageID_minor_nits

integration/container: TestCreateByImageID: minor improvements
This commit is contained in:
Sebastiaan van Stijn
2025-06-24 13:14:40 +02:00
committed by GitHub

View File

@@ -79,8 +79,13 @@ func TestCreateByImageID(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
imgIDWithAlgorithm := img.ID imgIDWithAlgorithm := img.ID
imgID, _ := strings.CutPrefix(imgIDWithAlgorithm, "sha256:") assert.Assert(t, imgIDWithAlgorithm != "")
imgShortID := stringid.TruncateID(imgID)
imgID, _ := strings.CutPrefix(img.ID, "sha256:")
assert.Assert(t, imgID != "")
imgShortID := stringid.TruncateID(img.ID)
assert.Assert(t, imgShortID != "")
testCases := []struct { testCases := []struct {
doc string doc string
@@ -131,8 +136,8 @@ func TestCreateByImageID(t *testing.T) {
assert.Check(t, is.Error(err, tc.expectedErr)) assert.Check(t, is.Error(err, tc.expectedErr))
assert.Check(t, is.ErrorType(err, tc.expectedErrType)) assert.Check(t, is.ErrorType(err, tc.expectedErrType))
} else { } else {
assert.Check(t, resp.ID != "")
assert.NilError(t, err) assert.NilError(t, err)
assert.Check(t, resp.ID != "")
} }
// cleanup the container if one was created. // cleanup the container if one was created.
_ = apiClient.ContainerRemove(ctx, resp.ID, container.RemoveOptions{Force: true}) _ = apiClient.ContainerRemove(ctx, resp.ID, container.RemoveOptions{Force: true})