handle unknow job id err

jackielii · Jun 25, 2019 · ee2b034 · ee2b034
1 parent 4d7d08f
commit ee2b034
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/api.go b/api.go
@@ -21,6 +21,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+var ErrUnknowJobID = errors.New("unknow job id")
+
 // Process is the process's base struct, use New to create a new instance
 type Process struct {
 	server   *machinery.Server
@@ -476,8 +478,8 @@ func (p JobQuery) GetProgress(jobID string) (progress string, err error) {
 	defer p.redisLock.Unlock()
 
 	s, err := redis.String(c.Do("GET", progressSubject(jobID)))
-	if err != redis.ErrNil {
-		return "", errors.New("unknow job id")
+	if err == redis.ErrNil {
+		return "", ErrUnknowJobID
 	}
 	if err != nil {
 		return "", err

diff --git a/api_test.go b/api_test.go
@@ -44,6 +44,9 @@ func TestNewProcess(t *testing.T) {
 			break
 		}
 		progress, err := j.GetProgress(jobID)
+		if err == ErrUnknowJobID {
+			continue
+		}
 		require.NoError(t, err)
 		if progress != prevProgress {
 			prevProgress = progress
@@ -200,6 +203,9 @@ func ExampleProcess() {
 			break
 		}
 		progress, err := j.GetProgress(jobID)
+		if err == ErrUnknowJobID {
+			continue
+		}
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -294,6 +300,9 @@ func TestChannelAPI(t *testing.T) {
 			break
 		}
 		progress, err := j.GetProgress(jobID)
+		if err == ErrUnknowJobID {
+			continue
+		}
 		require.NoError(t, err)
 		if progress != prevProgress {
 			prevProgress = progress