InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: update error-assertions in tests

Browse Source 
- use is.ErrorType
- replace uses of client.IsErrNotFound for errdefs.IsNotFound, as
  the client no longer returns the old error-type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-05-10 13:17:40 +02:00
parent 685b3d820a
commit 66ff1e063e
93 changed files with 282 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/image_search_test.go
View File

@@ -14,6 +14,8 @@ import (
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/errdefs"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
)
func TestImageSearchAnyError(t *testing.T) {
@@ -21,9 +23,7 @@ func TestImageSearchAnyError(t *testing.T) {
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
}
_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
if !errdefs.IsSystem(err) {
t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
}
assert.Check(t, is.ErrorType(err, errdefs.IsSystem))
}
func TestImageSearchStatusUnauthorizedError(t *testing.T) {
@@ -31,9 +31,7 @@ func TestImageSearchStatusUnauthorizedError(t *testing.T) {
client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
}
_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
if !errdefs.IsUnauthorized(err) {
t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
}
assert.Check(t, is.ErrorType(err, errdefs.IsUnauthorized))
}
func TestImageSearchWithUnauthorizedErrorAndPrivilegeFuncError(t *testing.T) {
@@ -61,9 +59,7 @@ func TestImageSearchWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.
_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
PrivilegeFunc: privilegeFunc,
})
if !errdefs.IsUnauthorized(err) {
t.Fatalf("expected a Unauthorized Error, got %[1]T: %[1]v", err)
}
assert.Check(t, is.ErrorType(err, errdefs.IsUnauthorized))
}
func TestImageSearchWithPrivilegedFuncNoError(t *testing.T) {