Quellcode durchsuchen

feature(worker): fix exec_post_hook_test, manager channel was blocked in the previous version

bigeagle vor 9 Jahren
Ursprung
Commit
8399417880
2 geänderte Dateien mit 12 neuen und 11 gelöschten Zeilen
  1. 6 5
      worker/exec_post_test.go
  2. 6 6
      worker/job_test.go

+ 6 - 5
worker/exec_post_test.go

@@ -82,7 +82,6 @@ echo $TUNASYNC_WORKING_DIR
 echo $TUNASYNC_MIRROR_NAME
 echo $TUNASYNC_UPSTREAM_URL
 echo $TUNASYNC_LOG_FILE
-sleep 5
 exit 1
 			`
 
@@ -93,10 +92,12 @@ exit 1
 			job.ctrlChan <- jobStart
 			msg := <-managerChan
 			So(msg.status, ShouldEqual, PreSyncing)
-			msg = <-managerChan
-			So(msg.status, ShouldEqual, Syncing)
-			msg = <-managerChan
-			So(msg.status, ShouldEqual, Failed)
+			for i := 0; i < maxRetry; i++ {
+				msg = <-managerChan
+				So(msg.status, ShouldEqual, Syncing)
+				msg = <-managerChan
+				So(msg.status, ShouldEqual, Failed)
+			}
 
 			time.Sleep(200 * time.Millisecond)
 			job.ctrlChan <- jobDisable

+ 6 - 6
worker/job_test.go

@@ -49,7 +49,7 @@ func TestMirrorJob(t *testing.T) {
 			echo $TUNASYNC_UPSTREAM_URL
 			echo $TUNASYNC_LOG_FILE
 			`
-			exceptedOutput := fmt.Sprintf(
+			expectedOutput := fmt.Sprintf(
 				"%s\n%s\n%s\n%s\n",
 				provider.WorkingDir(),
 				provider.Name(),
@@ -86,7 +86,7 @@ func TestMirrorJob(t *testing.T) {
 					So(msg.status, ShouldEqual, Success)
 					loggedContent, err := ioutil.ReadFile(provider.LogFile())
 					So(err, ShouldBeNil)
-					So(string(loggedContent), ShouldEqual, exceptedOutput)
+					So(string(loggedContent), ShouldEqual, expectedOutput)
 					job.ctrlChan <- jobStart
 				}
 				select {
@@ -140,10 +140,10 @@ echo $TUNASYNC_WORKING_DIR
 				msg = <-managerChan
 				So(msg.status, ShouldEqual, Failed)
 
-				exceptedOutput := fmt.Sprintf("%s\n", provider.WorkingDir())
+				expectedOutput := fmt.Sprintf("%s\n", provider.WorkingDir())
 				loggedContent, err := ioutil.ReadFile(provider.LogFile())
 				So(err, ShouldBeNil)
-				So(string(loggedContent), ShouldEqual, exceptedOutput)
+				So(string(loggedContent), ShouldEqual, expectedOutput)
 				job.ctrlChan <- jobDisable
 				<-job.disabled
 			})
@@ -159,14 +159,14 @@ echo $TUNASYNC_WORKING_DIR
 				msg = <-managerChan
 				So(msg.status, ShouldEqual, Success)
 
-				exceptedOutput := fmt.Sprintf(
+				expectedOutput := fmt.Sprintf(
 					"%s\n%s\n",
 					provider.WorkingDir(), provider.WorkingDir(),
 				)
 
 				loggedContent, err := ioutil.ReadFile(provider.LogFile())
 				So(err, ShouldBeNil)
-				So(string(loggedContent), ShouldEqual, exceptedOutput)
+				So(string(loggedContent), ShouldEqual, expectedOutput)
 				job.ctrlChan <- jobDisable
 				<-job.disabled
 			})