Skip to content

Commit 02fd27e

Browse files
committed
fix build image from exist tests
1 parent 76081c8 commit 02fd27e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mock: deps
3434
.ONESHELL:
3535

3636
cloc:
37-
cloc --exclude-dir=vendor,3rdmocks,mocks,tools --not-match-f=test .
37+
cloc --exclude-dir=vendor,3rdmocks,mocks,tools,gen --not-match-f=test .
3838

3939
unit-test:
4040
go vet `go list ./... | grep -v '/vendor/' | grep -v '/tools'`

cluster/calcium/build_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ func TestBuild(t *testing.T) {
120120
assert.Error(t, err)
121121
// build from exist not implemented
122122
opts.BuildMethod = types.BuildFromExist
123+
opts.ExistID = "123"
123124
engine.On("ImageBuildFromExist", mock.Anything, mock.Anything, mock.Anything).Return("", types.ErrEngineNotImplemented).Once()
124-
store.On("GetWorkload", mock.Anything, mock.Anything).Return(&types.Workload{}, nil)
125+
store.On("GetWorkload", mock.Anything, mock.Anything).Return(&types.Workload{Nodename: "123"}, nil)
125126
store.On("GetNode", mock.Anything, mock.Anything).Return(&types.Node{Engine: engine}, nil)
126127
ch, err = c.BuildImage(ctx, opts)
127128
assert.NoError(t, err)

cluster/calcium/image_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ func TestRemoveImage(t *testing.T) {
4848
engine.On("ImageRemove", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{"xx"}, nil)
4949
// sucess remove but prune fail
5050
engine.On("ImagesPrune", mock.Anything).Return(types.ErrBadStorage).Once()
51-
ch, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}})
51+
ch, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}, Prune: true})
5252
for c := range ch {
5353
assert.True(t, c.Success)
5454
}
5555
engine.On("ImagesPrune", mock.Anything).Return(nil)
56-
ch, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}})
56+
ch, err = c.RemoveImage(ctx, &types.ImageOptions{Podname: "podname", Images: []string{"xx"}, Prune: true})
5757
for c := range ch {
5858
assert.True(t, c.Success)
5959
}

0 commit comments

Comments
 (0)