beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reference: don't string-match errors in tests, and fix error format

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-11-14 17:10:42 +01:00
parent 669940065f
commit f71439d527
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reference/store.go
View file

@ -156,13 +156,13 @@ func (store *refStore) addReference(ref reference.Named, id digest.Digest, force
// force only works for tags
if digested, isDigest := ref.(reference.Canonical); isDigest {
return errors.WithStack(conflictingTagError("Cannot overwrite digest " + digested.Digest().String()))
return errors.WithStack(conflictingTagError("cannot overwrite digest " + digested.Digest().String()))
}
if !force {
return errors.WithStack(
conflictingTagError(
fmt.Sprintf("Conflict: Tag %s is already set to image %s, if you want to replace it, please use the force option", refStr, oldID.String()),
fmt.Sprintf("tag %s is already set to image %s, use the force option to replace it", refStr, oldID.String()),
),
)
}

11
reference/store_test.go
View file

@ -4,10 +4,10 @@ import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"
"github.com/docker/distribution/reference"
"github.com/docker/docker/errdefs"
"github.com/opencontainers/go-digest"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
@ -163,9 +163,8 @@ func TestAddDeleteGet(t *testing.T) {
}
// Attempt to overwrite with force == false
if err = store.AddTag(ref4, testImageID3, false); err == nil || !strings.HasPrefix(err.Error(), "Conflict:") {
t.Fatalf("did not get expected error on overwrite attempt - got %v", err)
}
err = store.AddTag(ref4, testImageID3, false)
assert.Check(t, is.ErrorType(err, errdefs.IsConflict), "did not get expected error on overwrite attempt")
// Repeat to overwrite with force == true
if err = store.AddTag(ref4, testImageID3, true); err != nil {
t.Fatalf("failed to force tag overwrite: %v", err)
@ -325,12 +324,12 @@ func TestInvalidTags(t *testing.T) {
ref, err := reference.ParseNormalizedNamed("sha256:abc")
assert.NilError(t, err)
err = store.AddTag(ref, id, true)
assert.Check(t, is.ErrorContains(err, ""))
assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
// setting digest as a tag
ref, err = reference.ParseNormalizedNamed("registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6")
assert.NilError(t, err)
err = store.AddTag(ref, id, true)
assert.Check(t, is.ErrorContains(err, ""))
assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
}