Skip to content

Commit 744c6fb

Browse files
committed
test(scheduler): remove ListTaskEntries mocks from PreheatFile tests
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 8c60ed0 commit 744c6fb

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

scheduler/service/service_v2_test.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4163,10 +4163,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
41634163
Scope: "invalid-scope",
41644164
},
41654165
run: func(t *testing.T, svc *V2, req *schedulerv2.PreheatFileRequest, mj *jobmocks.MockJobMockRecorder) {
4166-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{
4167-
Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}},
4168-
}, nil).Times(1)
4169-
41704166
assert := assert.New(t)
41714167
assert.ErrorIs(svc.PreheatFile(context.Background(), req), status.Errorf(codes.InvalidArgument, "unsupported preheat scope: invalid-scope"))
41724168
},
@@ -4182,7 +4178,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
41824178
defer wg.Wait()
41834179

41844180
gomock.InOrder(
4185-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
41864181
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
41874182
)
41884183

@@ -4202,9 +4197,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42024197
defer wg.Wait()
42034198

42044199
gomock.InOrder(
4205-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
42064200
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
42074201
)
4202+
42084203
assert := assert.New(t)
42094204
assert.NoError(svc.PreheatFile(context.Background(), req))
42104205
},
@@ -4221,9 +4216,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42214216
defer wg.Wait()
42224217

42234218
gomock.InOrder(
4224-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
42254219
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
42264220
)
4221+
42274222
assert := assert.New(t)
42284223
assert.NoError(svc.PreheatFile(context.Background(), req))
42294224
},
@@ -4240,9 +4235,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42404235
defer wg.Wait()
42414236

42424237
gomock.InOrder(
4243-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
42444238
mj.PreheatAllSeedPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
42454239
)
4240+
42464241
assert := assert.New(t)
42474242
assert.NoError(svc.PreheatFile(context.Background(), req))
42484243
},
@@ -4259,9 +4254,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42594254
defer wg.Wait()
42604255

42614256
gomock.InOrder(
4262-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
42634257
mj.PreheatAllSeedPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
42644258
)
4259+
42654260
assert := assert.New(t)
42664261
assert.NoError(svc.PreheatFile(context.Background(), req))
42674262
},
@@ -4278,9 +4273,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42784273
defer wg.Wait()
42794274

42804275
gomock.InOrder(
4281-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
42824276
mj.PreheatAllPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
42834277
)
4278+
42844279
assert := assert.New(t)
42854280
assert.NoError(svc.PreheatFile(context.Background(), req))
42864281
},
@@ -4297,7 +4292,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
42974292
defer wg.Wait()
42984293

42994294
gomock.InOrder(
4300-
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
43014295
mj.PreheatAllPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
43024296
)
43034297

0 commit comments

Comments
 (0)