Merge branch 'dev'

lxzan · Dec 28, 2022 · 5d2926b · 5d2926b
2 parents 9405618 + af62be0
commit 5d2926b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/worker_group.go b/worker_group.go
@@ -96,10 +96,10 @@ func (c *WorkerGroup) AddJob(jobs ...Job) {
 }
 
 // StartAndWait 启动并等待所有任务执行完成
-func (c *WorkerGroup) StartAndWait() {
+func (c *WorkerGroup) StartAndWait() error {
 	var taskTotal = int64(c.Len())
 	if taskTotal == 0 {
-		return
+		return nil
 	}
 
 	var co = min(c.config.Concurrency, taskTotal)
@@ -110,9 +110,5 @@ func (c *WorkerGroup) StartAndWait() {
 	}
 
 	<-c.done
-}
-
-// Err 获取错误返回
-func (c *WorkerGroup) Err() error {
 	return c.err
 }
diff --git a/worker_group_test.go b/worker_group_test.go
@@ -15,8 +15,8 @@ func TestNewTaskGroup(t *testing.T) {
 
 	t.Run("0 task", func(t *testing.T) {
 		cc := NewWorkerGroup()
-		cc.StartAndWait()
-		as.NoError(cc.Err())
+		err := cc.StartAndWait()
+		as.NoError(err)
 	})
 
 	t.Run("1 task", func(t *testing.T) {
@@ -27,8 +27,8 @@ func TestNewTaskGroup(t *testing.T) {
 				return nil
 			},
 		})
-		cc.StartAndWait()
-		as.NoError(cc.Err())
+		err := cc.StartAndWait()
+		as.NoError(err)
 	})
 
 	t.Run("100 task", func(t *testing.T) {
@@ -43,7 +43,7 @@ func TestNewTaskGroup(t *testing.T) {
 				},
 			})
 		}
-		w.StartAndWait()
+		_ = w.StartAndWait()
 		as.Equal(sum, int64(5050))
 	})
 
@@ -63,8 +63,8 @@ func TestNewTaskGroup(t *testing.T) {
 				},
 			},
 		)
-		cc.StartAndWait()
-		as.Error(cc.Err())
+		err := cc.StartAndWait()
+		as.Error(err)
 	})
 
 	t.Run("timeout", func(t *testing.T) {
@@ -87,8 +87,8 @@ func TestNewTaskGroup(t *testing.T) {
 			Job{7, do},
 			Job{9, do},
 		)
-		ctl.StartAndWait()
-		as.NoError(ctl.Err())
+		err := ctl.StartAndWait()
+		as.NoError(err)
 		as.ElementsMatch(list, []int{1, 3})
 	})
 
@@ -100,7 +100,7 @@ func TestNewTaskGroup(t *testing.T) {
 				return args.(error)
 			},
 		})
-		ctl.StartAndWait()
-		as.Error(ctl.Err())
+		err := ctl.StartAndWait()
+		as.Error(err)
 	})
 }