Merged the timeout logic for the tests in internal_workers_test.go (#1225)

* Merged the timeout loging for the tests in internal_workers_test.go

* Fixed the import order and fixed the name of the function

Author: jakobht

internal/internal_workers_test.go

@@ -346,14 +346,7 @@ func (s *WorkersTestSuite) TestLongRunningDecisionTask() {
 	)
 	worker.RegisterActivity(localActivitySleep)
 
-	worker.Start()
-	// wait for test to complete
-	select {
-	case <-doneCh:
-		break
-	case <-time.After(time.Second * 4):
-	}
-	worker.Stop()
+	startWorkerAndWait(s, worker, &doneCh)
 
 	s.True(isWorkflowCompleted)
 	s.Equal(2, localActivityCalledCount)
@@ -531,9 +524,7 @@ func (s *WorkersTestSuite) TestQueryTask_WorkflowCacheEvicted() {
 		RegisterActivityOptions{Name: activityType},
 	)
 
-	worker.Start()
-	<-doneCh
-	worker.Stop()
+	startWorkerAndWait(s, worker, &doneCh)
 }
 
 func (s *WorkersTestSuite) TestMultipleLocalActivities() {
@@ -653,14 +644,7 @@ func (s *WorkersTestSuite) TestMultipleLocalActivities() {
 	)
 	worker.RegisterActivity(localActivitySleep)
 
-	worker.Start()
-	// wait for test to complete
-	select {
-	case <-doneCh:
-		break
-	case <-time.After(time.Second * 5):
-	}
-	worker.Stop()
+	startWorkerAndWait(s, worker, &doneCh)
 
 	s.True(isWorkflowCompleted)
 	s.Equal(2, localActivityCalledCount)
@@ -770,14 +754,7 @@ func (s *WorkersTestSuite) TestLocallyDispatchedActivity() {
 	)
 	worker.RegisterActivityWithOptions(activitySleep, RegisterActivityOptions{Name: "activitySleep"})
 
-	worker.Start()
-	// wait for test to complete
-	select {
-	case <-doneCh:
-		break
-	case <-time.After(1 * time.Second):
-	}
-	worker.Stop()
+	startWorkerAndWait(s, worker, &doneCh)
 
 	s.True(isActivityResponseCompleted)
 	s.Equal(1, activityCalledCount)
@@ -888,6 +865,8 @@ func (s *WorkersTestSuite) TestMultipleLocallyDispatchedActivity() {
 	worker.Start()
 
 	// wait for test to complete
+	// This test currently never completes, however after the timeout the asserts are true
+	// so the test passes, I believe this is an error.
 	select {
 	case <-doneCh:
 		break
@@ -899,3 +878,17 @@ func (s *WorkersTestSuite) TestMultipleLocallyDispatchedActivity() {
 	s.True(activityResponseCompletedCount > 0)
 	s.True(activityCalledCount > 0)
 }
+
+// wait for test to complete - timeout and fail after 10 seconds to not block execution of other tests
+func startWorkerAndWait(s *WorkersTestSuite, worker *aggregatedWorker, doneCh *chan struct{}) {
+	s.T().Helper()
+	worker.Start()
+	// wait for test to complete
+	select {
+	case <-*doneCh:
+		return
+	case <-time.After(10 * time.Second):
+		s.Fail("Test timed out")
+	}
+	worker.Stop()
+}