From 7579a9ba2da342d907bf120494c6767bdfe9a554 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 24 Sep 2024 10:38:18 +0800 Subject: [PATCH] test: generate mode task id for testings (#3526) Signed-off-by: Gaius --- manager/handlers/job_test.go | 6 +++--- manager/job/task_test.go | 8 ++++---- test/e2e/v2/manager/task.go | 28 ++-------------------------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/manager/handlers/job_test.go b/manager/handlers/job_test.go index 80dbdc379..37d288b0d 100644 --- a/manager/handlers/job_test.go +++ b/manager/handlers/job_test.go @@ -81,21 +81,21 @@ var ( UserID: 4, Type: "preheat", BIO: "bio", - TaskID: "2", + TaskID: "dec6fe878785cea844dcecdf2ea25e19156822201016455733e47e9f0bfab563", } mockGetTaskJobModel = &models.Job{ BaseModel: mockBaseModel, UserID: 4, Type: "get_task", BIO: "bio", - TaskID: "2", + TaskID: "7575d21d69495905a4709bf4e10d0e5cffcf7fd1e76e93171e0ef6e0abcf07a8", } mockDeleteTaskJobModel = &models.Job{ BaseModel: mockBaseModel, UserID: 4, Type: "delete_task", BIO: "bio", - TaskID: "2", + TaskID: "04a29122b0c4d0affde2d577fb36bb956caa3da10e9130375623c24a5f865a49", } ) diff --git a/manager/job/task_test.go b/manager/job/task_test.go index a3e86d90e..6a552cc6c 100644 --- a/manager/job/task_test.go +++ b/manager/job/task_test.go @@ -47,7 +47,7 @@ func TestTask_CreateGetTask(t *testing.T) { }, }, args: types.GetTaskArgs{ - TaskID: "valid-task-id", + TaskID: "e7a7132d133ab769af4b64c54c0ea4572d2089142d9f1c04203572697439f467", }, expect: func(t *testing.T, g *job.GroupJobState, e error) { assert := assert.New(t) @@ -63,7 +63,7 @@ func TestTask_CreateGetTask(t *testing.T) { }, }, args: types.GetTaskArgs{ - TaskID: "valid-task-id", + TaskID: "55697b6298a6ee5118443f23c4f4532666421361d31d4b1e822d2480c42eda0c", }, expect: func(t *testing.T, g *job.GroupJobState, e error) { assert := assert.New(t) @@ -98,7 +98,7 @@ func TestTask_CreateDeleteTask(t *testing.T) { }, }, args: types.DeleteTaskArgs{ - TaskID: "valid-task-id", + TaskID: "e7a7132d133ab769af4b64c54c0ea4572d2089142d9f1c04203572697439f467", }, expect: func(t *testing.T, g *job.GroupJobState, e error) { assert := assert.New(t) @@ -114,7 +114,7 @@ func TestTask_CreateDeleteTask(t *testing.T) { }, }, args: types.DeleteTaskArgs{ - TaskID: "valid-task-id", + TaskID: "55697b6298a6ee5118443f23c4f4532666421361d31d4b1e822d2480c42eda0c", }, expect: func(t *testing.T, g *job.GroupJobState, e error) { assert := assert.New(t) diff --git a/test/e2e/v2/manager/task.go b/test/e2e/v2/manager/task.go index d886e30a3..88062e9dd 100644 --- a/test/e2e/v2/manager/task.go +++ b/test/e2e/v2/manager/task.go @@ -33,7 +33,6 @@ import ( var _ = Describe("GetTask and DeleteTask with Manager", func() { Context("/bin/cat file", Label("getTask", "deleteTask", "file"), func() { It("getTask and deleteTask should be ok", func() { - // Create preheat job. managerPod, err := util.ManagerExec(0) fmt.Println(err) Expect(err).NotTo(HaveOccurred()) @@ -74,12 +73,10 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { Expect(err).NotTo(HaveOccurred()) } - // Check the file is downloaded successfully. sha256sum, err := util.CalculateSha256ByTaskID(seedClientPods, fileMetadata.ID) Expect(err).NotTo(HaveOccurred()) Expect(fileMetadata.Sha256).To(Equal(sha256sum)) - // Get task. req, err = structure.StructToMap(types.CreateGetTaskJobRequest{ Type: internaljob.GetTaskJob, Args: types.GetTaskArgs{ @@ -100,11 +97,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done = waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - - // Check get task response is valid. Expect(validateTaskResponse(job)).To(BeTrue()) - // Delete task. req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{ Type: internaljob.DeleteTaskJob, Args: types.DeleteTaskArgs{ @@ -125,11 +119,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done = waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - - // Check delete task response is valid. Expect(validateTaskResponse(job)).To(BeTrue()) - // Check file is deleted successfully. exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID) Expect(exist).Should(BeFalse()) }) @@ -137,7 +128,6 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { Context("/bin/pwd file", Label("getTask", "deleteTask", "file"), func() { It("getTask and deleteTask should be ok", func() { - // Create preheat job. managerPod, err := util.ManagerExec(0) fmt.Println(err) Expect(err).NotTo(HaveOccurred()) @@ -178,12 +168,10 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { Expect(err).NotTo(HaveOccurred()) } - // Check the file is downloaded successfully. sha256sum, err := util.CalculateSha256ByTaskID(seedClientPods, fileMetadata.ID) Expect(err).NotTo(HaveOccurred()) Expect(fileMetadata.Sha256).To(Equal(sha256sum)) - // Get task. req, err = structure.StructToMap(types.CreateGetTaskJobRequest{ Type: internaljob.GetTaskJob, Args: types.GetTaskArgs{ @@ -204,11 +192,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done = waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - - // Check get task response is valid. Expect(validateTaskResponse(job)).To(BeTrue()) - // Delete task. req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{ Type: internaljob.DeleteTaskJob, Args: types.DeleteTaskArgs{ @@ -229,11 +214,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done = waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - - // Check delete task response is valid. Expect(validateTaskResponse(job)).To(BeTrue()) - // Check file is deleted successfully. exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID) Expect(exist).Should(BeFalse()) }) @@ -257,11 +239,9 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { Expect(err).NotTo(HaveOccurred()) } - // Check the file is not exist. exist := util.CheckFilesExist(seedClientPods, fileMetadata.ID) Expect(exist).Should(BeFalse()) - // Get task. req, err := structure.StructToMap(types.CreateGetTaskJobRequest{ Type: internaljob.GetTaskJob, Args: types.GetTaskArgs{ @@ -282,11 +262,8 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done := waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - - // Check get task response is invalid. Expect(validateTaskResponse(job)).To(BeFalse()) - // Delete task. req, err = structure.StructToMap(types.CreateDeleteTaskJobRequest{ Type: internaljob.DeleteTaskJob, Args: types.DeleteTaskArgs{ @@ -308,23 +285,22 @@ var _ = Describe("GetTask and DeleteTask with Manager", func() { done = waitForDone(job, managerPod) Expect(done).Should(BeTrue()) - // Check delete task response is invalid. Expect(validateTaskResponse(job)).To(BeFalse()) }) }) }) func validateTaskResponse(job *models.Job) bool { - // Check task response is not null. Expect(job.Result).NotTo(BeNil()) + groupJobStateData, err := json.Marshal(job.Result) Expect(err).NotTo(HaveOccurred()) + groupJobState := internaljob.GroupJobState{} err = json.Unmarshal(groupJobStateData, &groupJobState) Expect(err).NotTo(HaveOccurred()) Expect(len(groupJobState.JobStates)).Should(BeNumerically("==", 3)) - // Check task response is valid. for _, state := range groupJobState.JobStates { for _, result := range state.Results { resultData, err := json.Marshal(result)