From 839941788079a3a790ce74c367710bccecbc3412 Mon Sep 17 00:00:00 2001
From: bigeagle <justin.w.xd@gmail.com>
Date: Fri, 29 Apr 2016 22:11:59 +0800
Subject: [PATCH] feature(worker): fix exec_post_hook_test, manager channel was
 blocked in the previous version

---
 worker/exec_post_test.go | 11 ++++++-----
 worker/job_test.go       | 12 ++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/worker/exec_post_test.go b/worker/exec_post_test.go
index e2f7efc..203c607 100644
--- a/worker/exec_post_test.go
+++ b/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
diff --git a/worker/job_test.go b/worker/job_test.go
index 1edc14b..7ffed72 100644
--- a/worker/job_test.go
+++ b/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
 			})