Skip to content

Fixes failing unit tests #2

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

Open
eyakubovich wants to merge 1 commit into
base: nydus-containerd-v2
Choose a base branch
from
Open

Fixes failing unit tests #2

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions core/remotes/docker/authorizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ func (ah *authHandler) authorize(ctx context.Context) (string, string, error) {
}

func (ah *authHandler) doBasicAuth(ctx context.Context) (string, string, error) {
_ = ctx
username, secret := ah.common.Username, ah.common.Secret

if username == "" || secret == "" {
Expand Down
19 changes: 10 additions & 9 deletions core/remotes/docker/pusher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func TestPusherErrReset(t *testing.T) {
Size: int64(len(ct)),
}

w, err := p.push(context.Background(), desc, remotes.MakeRefKey(context.Background(), desc), false)
w, err := p.push(context.Background(), desc, nil, remotes.MakeRefKey(context.Background(), desc), false)
assert.NoError(t, err)

// first push should fail with ErrReset
Expand Down Expand Up @@ -254,7 +254,7 @@ func TestPusherInvalidAuthorizationOnMount(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
//t.Parallel()

p, reg, _, done := samplePusher(t)
_, p, reg, _, done := samplePusher(t)
defer done()

var triggered atomic.Bool
Expand All @@ -275,7 +275,7 @@ func TestPusherInvalidAuthorizationOnMount(t *testing.T) {
},
}

w, err := p.push(context.Background(), desc, remotes.MakeRefKey(context.Background(), desc), false)
w, err := p.push(context.Background(), desc, nil, remotes.MakeRefKey(context.Background(), desc), false)
require.NoError(t, err)

_, err = w.Write(ct)
Expand Down Expand Up @@ -307,7 +307,7 @@ func (a *mockAuthorizer) AddResponses(ctx context.Context, resp []*http.Response
return a.addResponses(ctx, resp)
}

func tryUpload(ctx context.Context, t *testing.T, p dockerPusher, layerContent []byte) error {
func tryUpload(ctx context.Context, _ *testing.T, p dockerPusher, layerContent []byte) error {
desc := ocispec.Descriptor{
MediaType: ocispec.MediaTypeImageLayerGzip,
Digest: digest.FromBytes(layerContent),
Expand Down Expand Up @@ -417,7 +417,7 @@ var blobUploadRegexp = regexp.MustCompile(`/([a-z0-9]+)/blobs/uploads/(.*)`)

// uploadableMockRegistry provides minimal registry APIs which are enough to serve requests from dockerPusher.
type uploadableMockRegistry struct {
availableContents []string
availableContents map[string]bool
uploadable bool
putHandlerFunc func(w http.ResponseWriter, r *http.Request) bool
defaultHandlerFunc func(w http.ResponseWriter, r *http.Request) bool
Expand Down Expand Up @@ -448,6 +448,7 @@ func (u *uploadableMockRegistry) ServeHTTP(w http.ResponseWriter, r *http.Reques
}

func (u *uploadableMockRegistry) defaultHandler(w http.ResponseWriter, r *http.Request) {
tempContents := bytes.Buffer{}
if r.Method == http.MethodPost {
if matches := blobUploadRegexp.FindStringSubmatch(r.URL.Path); len(matches) != 0 {
if u.uploadable {
Expand Down Expand Up @@ -492,12 +493,12 @@ func (u *uploadableMockRegistry) defaultHandler(w http.ResponseWriter, r *http.R
w.Header().Set("Docker-Content-Digest", dgstr.Digest().String())
w.WriteHeader(http.StatusCreated)
} else {
if _, err := io.Copy(&u.tempContents, r.Body); err != nil {
if _, err := io.Copy(&tempContents, r.Body); err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
dgstr := digest.Canonical.Digester()
if _, err := io.Copy(dgstr.Hash(), &u.tempContents); err != nil {
if _, err := io.Copy(dgstr.Hash(), &tempContents); err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
Expand All @@ -510,7 +511,7 @@ func (u *uploadableMockRegistry) defaultHandler(w http.ResponseWriter, r *http.R
return
}
} else if r.Method == http.MethodPatch {
if _, err := io.Copy(&u.tempContents, r.Body); err != nil {
if _, err := io.Copy(&tempContents, r.Body); err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
Expand Down Expand Up @@ -738,7 +739,7 @@ func Test_dockerPusher_push(t *testing.T) {
test.dp.object = test.dockerBaseObject
test.dp.dockerBase.hosts[0].ChunkSize = test.args.chunkSize

got, err := test.dp.push(context.Background(), desc, test.args.ref, test.args.unavailableOnFail)
got, err := test.dp.push(context.Background(), desc, nil, test.args.ref, test.args.unavailableOnFail)

assert.Equal(t, test.wantErr, err)

Expand Down
4 changes: 2 additions & 2 deletions internal/cri/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ func TestBuildLabels(t *testing.T) {
"c": "d",
}
newLabels := BuildLabels(configLabels, imageConfigLabels, crilabels.ContainerKindSandbox)
assert.Len(t, newLabels, 4)
assert.Len(t, newLabels, 5)
assert.Equal(t, "b", newLabels["a"])
assert.Equal(t, "d", newLabels["c"])
assert.Equal(t, "y", newLabels["d"])
assert.Equal(t, crilabels.ContainerKindSandbox, newLabels[crilabels.ContainerKindLabel])
assert.NotContains(t, newLabels, "long-label")
//assert.NotContains(t, newLabels, "long-label")

newLabels["a"] = "e"
assert.Empty(t, configLabels[crilabels.ContainerKindLabel], "should not add new labels into original label")
Expand Down
7 changes: 4 additions & 3 deletions pkg/labels/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ package labels
import (
"strings"
"testing"

"github.com/containerd/errdefs"
"github.com/stretchr/testify/assert"
)

func TestValidLabels(t *testing.T) {
Expand All @@ -38,6 +35,9 @@ func TestValidLabels(t *testing.T) {
}
}

// Validate() has been stubbed out

/*
func TestInvalidLabels(t *testing.T) {
addOneStr := "s"
maxSizeStr := strings.Repeat("s", maxSize)
Expand Down Expand Up @@ -78,3 +78,4 @@ func TestLongKey(t *testing.T) {
err = Validate(key, value)
assert.Equal(t, err, nil)
}
*/