Skip to content

Commit 7579a9b

Browse files
gaius-qigaius-qi
authored
test: generate mode task id for testings (#3526)
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 80717c7 commit 7579a9b

File tree

3 files changed

+9
-33
lines changed

3 files changed

+9
-33
lines changed

‎manager/handlers/job_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ var (
8181
UserID: 4,
8282
Type: "preheat",
8383
BIO: "bio",
84-
TaskID: "2",
84+
TaskID: "dec6fe878785cea844dcecdf2ea25e19156822201016455733e47e9f0bfab563",
8585
}
8686
mockGetTaskJobModel = &models.Job{
8787
BaseModel: mockBaseModel,
8888
UserID: 4,
8989
Type: "get_task",
9090
BIO: "bio",
91-
TaskID: "2",
91+
TaskID: "7575d21d69495905a4709bf4e10d0e5cffcf7fd1e76e93171e0ef6e0abcf07a8",
9292
}
9393
mockDeleteTaskJobModel = &models.Job{
9494
BaseModel: mockBaseModel,
9595
UserID: 4,
9696
Type: "delete_task",
9797
BIO: "bio",
98-
TaskID: "2",
98+
TaskID: "04a29122b0c4d0affde2d577fb36bb956caa3da10e9130375623c24a5f865a49",
9999
}
100100
)
101101

‎manager/job/task_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestTask_CreateGetTask(t *testing.T) {
4747
},
4848
},
4949
args: types.GetTaskArgs{
50-
TaskID: "valid-task-id",
50+
TaskID: "e7a7132d133ab769af4b64c54c0ea4572d2089142d9f1c04203572697439f467",
5151
},
5252
expect: func(t *testing.T, g *job.GroupJobState, e error) {
5353
assert := assert.New(t)
@@ -63,7 +63,7 @@ func TestTask_CreateGetTask(t *testing.T) {
6363
},
6464
},
6565
args: types.GetTaskArgs{
66-
TaskID: "valid-task-id",
66+
TaskID: "55697b6298a6ee5118443f23c4f4532666421361d31d4b1e822d2480c42eda0c",
6767
},
6868
expect: func(t *testing.T, g *job.GroupJobState, e error) {
6969
assert := assert.New(t)
@@ -98,7 +98,7 @@ func TestTask_CreateDeleteTask(t *testing.T) {
9898
},
9999
},
100100
args: types.DeleteTaskArgs{
101-
TaskID: "valid-task-id",
101+
TaskID: "e7a7132d133ab769af4b64c54c0ea4572d2089142d9f1c04203572697439f467",
102102
},
103103
expect: func(t *testing.T, g *job.GroupJobState, e error) {
104104
assert := assert.New(t)
@@ -114,7 +114,7 @@ func TestTask_CreateDeleteTask(t *testing.T) {
114114
},
115115
},
116116
args: types.DeleteTaskArgs{
117-
TaskID: "valid-task-id",
117+
TaskID: "55697b6298a6ee5118443f23c4f4532666421361d31d4b1e822d2480c42eda0c",
118118
},
119119
expect: func(t *testing.T, g *job.GroupJobState, e error) {
120120
assert := assert.New(t)

‎test/e2e/v2/manager/task.go‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
var _ = Describe("GetTask and DeleteTask with Manager", func() {
3434
Context("/bin/cat file", Label("getTask", "deleteTask", "file"), func() {
3535
It("getTask and deleteTask should be ok", func() {
36-
// Create preheat job.
3736
managerPod, err := util.ManagerExec(0)
3837
fmt.Println(err)
3938
Expect(err).NotTo(HaveOccurred())
@@ -74,12 +73,10 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
7473
Expect(err).NotTo(HaveOccurred())
7574
}
7675

77-
// Check the file is downloaded successfully.
7876
sha256sum, err := util.CalculateSha256ByTaskID(seedClientPods, fileMetadata.ID)
7977
Expect(err).NotTo(HaveOccurred())
8078
Expect(fileMetadata.Sha256).To(Equal(sha256sum))
8179

82-
// Get task.
8380
req, err = structure.StructToMap(types.CreateGetTaskJobRequest{
8481
Type: internaljob.GetTaskJob,
8582
Args: types.GetTaskArgs{
@@ -100,11 +97,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
10097

10198
done = waitForDone(job, managerPod)
10299
Expect(done).Should(BeTrue())
103-
104-
// Check get task response is valid.
105100
Expect(validateTaskResponse(job)).To(BeTrue())
106101

107-
// Delete task.
108102
req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{
109103
Type: internaljob.DeleteTaskJob,
110104
Args: types.DeleteTaskArgs{
@@ -125,19 +119,15 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
125119

126120
done = waitForDone(job, managerPod)
127121
Expect(done).Should(BeTrue())
128-
129-
// Check delete task response is valid.
130122
Expect(validateTaskResponse(job)).To(BeTrue())
131123

132-
// Check file is deleted successfully.
133124
exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID)
134125
Expect(exist).Should(BeFalse())
135126
})
136127
})
137128

138129
Context("/bin/pwd file", Label("getTask", "deleteTask", "file"), func() {
139130
It("getTask and deleteTask should be ok", func() {
140-
// Create preheat job.
141131
managerPod, err := util.ManagerExec(0)
142132
fmt.Println(err)
143133
Expect(err).NotTo(HaveOccurred())
@@ -178,12 +168,10 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
178168
Expect(err).NotTo(HaveOccurred())
179169
}
180170

181-
// Check the file is downloaded successfully.
182171
sha256sum, err := util.CalculateSha256ByTaskID(seedClientPods, fileMetadata.ID)
183172
Expect(err).NotTo(HaveOccurred())
184173
Expect(fileMetadata.Sha256).To(Equal(sha256sum))
185174

186-
// Get task.
187175
req, err = structure.StructToMap(types.CreateGetTaskJobRequest{
188176
Type: internaljob.GetTaskJob,
189177
Args: types.GetTaskArgs{
@@ -204,11 +192,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
204192

205193
done = waitForDone(job, managerPod)
206194
Expect(done).Should(BeTrue())
207-
208-
// Check get task response is valid.
209195
Expect(validateTaskResponse(job)).To(BeTrue())
210196

211-
// Delete task.
212197
req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{
213198
Type: internaljob.DeleteTaskJob,
214199
Args: types.DeleteTaskArgs{
@@ -229,11 +214,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
229214

230215
done = waitForDone(job, managerPod)
231216
Expect(done).Should(BeTrue())
232-
233-
// Check delete task response is valid.
234217
Expect(validateTaskResponse(job)).To(BeTrue())
235218

236-
// Check file is deleted successfully.
237219
exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID)
238220
Expect(exist).Should(BeFalse())
239221
})
@@ -257,11 +239,9 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
257239
Expect(err).NotTo(HaveOccurred())
258240
}
259241

260-
// Check the file is not exist.
261242
exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID)
262243
Expect(exist).Should(BeFalse())
263244

264-
// Get task.
265245
req, err := structure.StructToMap(types.CreateGetTaskJobRequest{
266246
Type: internaljob.GetTaskJob,
267247
Args: types.GetTaskArgs{
@@ -282,11 +262,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
282262

283263
done := waitForDone(job, managerPod)
284264
Expect(done).Should(BeTrue())
285-
286-
// Check get task response is invalid.
287265
Expect(validateTaskResponse(job)).To(BeFalse())
288266

289-
// Delete task.
290267
req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{
291268
Type: internaljob.DeleteTaskJob,
292269
Args: types.DeleteTaskArgs{
@@ -308,23 +285,22 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() {
308285
done = waitForDone(job, managerPod)
309286
Expect(done).Should(BeTrue())
310287

311-
// Check delete task response is invalid.
312288
Expect(validateTaskResponse(job)).To(BeFalse())
313289
})
314290
})
315291
})
316292

317293
func validateTaskResponse(job *models.Job) bool {
318-
// Check task response is not null.
319294
Expect(job.Result).NotTo(BeNil())
295+
320296
groupJobStateData, err := json.Marshal(job.Result)
321297
Expect(err).NotTo(HaveOccurred())
298+
322299
groupJobState := internaljob.GroupJobState{}
323300
err = json.Unmarshal(groupJobStateData, &groupJobState)
324301
Expect(err).NotTo(HaveOccurred())
325302
Expect(len(groupJobState.JobStates)).Should(BeNumerically("==", 3))
326303

327-
// Check task response is valid.
328304
for _, state := range groupJobState.JobStates {
329305
for _, result := range state.Results {
330306
resultData, err := json.Marshal(result)

0 commit comments

Comments
 (0)