Merge pull request #276 from form3tech-oss/nvloff-268

fix: users in a staged run would exit immediately without max iterations

Author: nvloff-f3

internal/run/run_cmd_test.go

@@ -5,6 +5,8 @@ import (
 	"time"
 )
 
+const Any = int64(-1)
+
 func TestSimpleFlow(t *testing.T) {
 	t.Parallel()
 
@@ -49,7 +51,7 @@ type testParam struct {
 	constantRate              string
 	testDuration              time.Duration
 	expectedRunTime           time.Duration
-	expectedCompletedTests    uint32
+	expectedCompletedTests    int64
 	concurrency               int
 	iterationDuration         time.Duration
 	expectedDroppedIterations uint64
@@ -349,6 +351,15 @@ func TestParameterised(t *testing.T) {
 			expectedRunTime:        1800 * time.Millisecond,
 			expectedCompletedTests: 105,
 		},
+		{
+			name:                   "staged users without max iterations",
+			triggerType:            File,
+			configFile:             "../testdata/config-file-issue-268.yaml",
+			testDuration:           5 * time.Second,
+			iterationDuration:      0,
+			expectedRunTime:        3000 * time.Millisecond,
+			expectedCompletedTests: Any,
+		},
 		{
 			name:                   "config file test using limited max-duration",
 			triggerType:            File,

internal/run/run_stage_test.go

@@ -261,8 +261,12 @@ func (s *RunTestStage) the_command_should_have_run_for_approx(expectedDuration t
 	return s
 }
 
-func (s *RunTestStage) the_number_of_started_iterations_should_be(expected uint32) *RunTestStage {
-	s.assert.Equal(int(expected), int(s.runCount.Load()), "number of started iterations")
+func (s *RunTestStage) the_number_of_started_iterations_should_be(expected int64) *RunTestStage {
+	if expected == Any {
+		s.assert.Positive(s.runCount.Load())
+	} else {
+		s.assert.Equal(int(expected), int(s.runCount.Load()), "number of started iterations")
+	}
 	return s
 }
 
@@ -355,8 +359,12 @@ func (s *RunTestStage) setup_teardown_is_called() *RunTestStage {
 	return s
 }
 
-func (s *RunTestStage) iteration_teardown_is_called_n_times(n uint32) *RunTestStage {
-	s.assert.Equal(int(n), int(s.iterationTeardownCount.Load()), "iteration teardown was not called expected times")
+func (s *RunTestStage) iteration_teardown_is_called_n_times(n int64) *RunTestStage {
+	if n == Any {
+		s.assert.Positive(s.iterationTeardownCount.Load())
+	} else {
+		s.assert.Equal(int(n), int(s.iterationTeardownCount.Load()), "iteration teardown was not called expected times")
+	}
 	return s
 }
 

internal/testdata/config-file-issue-268.yaml

@@ -0,0 +1,9 @@
+scenario: test
+limits:
+  max-duration: 5s
+  max-iterations: 0
+  concurrency: 5
+  ignore-dropped: true
+stages:
+  - duration: 3s
+    mode: users

internal/trigger/users/users_rate.go

@@ -48,5 +48,6 @@ func NewWorker(concurrency int) api.WorkTriggerer {
 	return func(ctx context.Context, _ *ui.Output, workers *workers.PoolManager, _ options.RunOptions) {
 		pool := workers.NewContinuousPool(concurrency)
 		pool.Start(ctx)
+		<-workers.WaitForCompletion()
 	}
 }