Skip to content

Commit 39a7d58

Browse files
committed
seems deploy is fine now
1 parent 833acff commit 39a7d58

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

cluster/calcium/network.go

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func (c *Calcium) ConnectNetwork(ctx context.Context, network, target, ipv4, ipv
4545
logger := log.WithFunc("calcium.ConnectNetwork").WithField("network", network).WithField("target", target).WithField("ipv4", ipv4).WithField("ipv6", ipv6)
4646
workload, err := c.GetWorkload(ctx, target)
4747
if err != nil {
48-
logger.Error(ctx, err)
4948
return nil, err
5049
}
5150

engine/mocks/fakeengine/mock.go

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ func MakeClient(ctx context.Context, config coretypes.Config, nodename, endpoint
107107
e.On("VirtualizationResize", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
108108
e.On("VirtualizationWait", mock.Anything, mock.Anything, mock.Anything).Return(&enginetypes.VirtualizationWaitResult{Message: "", Code: 0}, nil)
109109
e.On("VirtualizationUpdateResource", mock.Anything, mock.Anything, mock.Anything).Return(nil)
110-
111110
e.On("VirtualizationCopyFrom", mock.Anything, mock.Anything, mock.Anything).Return([]byte("d1...\nd2...\n"), 0, 0, int64(0), nil)
112111
// e.On("ResourceValidate", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
113112
return e, nil

resource/cobalt/alloc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func (m Manager) Alloc(ctx context.Context, nodename string, deployCount int, op
2727
logger := log.WithFunc("resource.coblat.Alloc")
2828

2929
// index -> no, map by plugin name
30-
workloadsParams := []types.Resources{}
31-
engineParams := []types.Resources{}
30+
workloadsParams := make([]types.Resources, deployCount)
31+
engineParams := make([]types.Resources, deployCount)
3232

3333
// init engine args
3434
for i := 0; i < deployCount; i++ {

store/etcdv3/node_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestGetNodesByPod(t *testing.T) {
161161
assert.NoError(t, err)
162162
ns, err = m.GetNodesByPod(ctx, &types.NodeFilter{All: false})
163163
assert.NoError(t, err)
164-
assert.Empty(t, ns)
164+
assert.Len(t, ns, 1) // because mock forced to up, so here is 1
165165
ns, err = m.GetNodesByPod(ctx, &types.NodeFilter{All: true})
166166
assert.NoError(t, err)
167167
assert.NotEmpty(t, ns)

store/redis/node_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (s *RediaronTestSuite) TestGetNodesByPod() {
130130
s.NoError(err)
131131
ns, err = s.rediaron.GetNodesByPod(ctx, &types.NodeFilter{All: false})
132132
s.NoError(err)
133-
s.Empty(ns)
133+
s.Len(ns, 1) // because mock forced to up, so here is 1
134134
ns, err = s.rediaron.GetNodesByPod(ctx, &types.NodeFilter{All: true})
135135
s.NoError(err)
136136
s.NotEmpty(ns)

0 commit comments

Comments
 (0)