fix runner expected-error check potential panic (#177)

coreruleset · Aug 23, 2023 · ceb4bc9 · ceb4bc9
1 parent b23cf19
commit ceb4bc9
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/runner/run.go b/runner/run.go
@@ -120,6 +120,10 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 	testInput := stage.Input
 	test.ApplyInputOverrides(&runContext.Config.TestOverride.Overrides, &testInput)
 	expectedOutput := stage.Output
+	expectErr := false
+	if expectedOutput.ExpectError != nil {
+		expectErr = *expectedOutput.ExpectError
+	}
 
 	// Check sanity first
 	if checkTestSanity(testInput) {
@@ -144,7 +148,7 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 
 	if notRunningInCloudMode(ftwCheck) {
 		startMarker, err := markAndFlush(runContext, dest, stageID)
-		if err != nil && !*expectedOutput.ExpectError {
+		if err != nil && !expectErr {
 			return fmt.Errorf("failed to find start marker: %w", err)
 		}
 		ftwCheck.SetStartMarker(startMarker)
@@ -154,21 +158,21 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 
 	err := runContext.Client.NewConnection(*dest)
 
-	if err != nil && !*expectedOutput.ExpectError {
+	if err != nil && !expectErr {
 		return fmt.Errorf("can't connect to destination %+v: %w", dest, err)
 	}
 	runContext.Client.StartTrackingTime()
 
 	response, responseErr := runContext.Client.Do(*req)
 
 	runContext.Client.StopTrackingTime()
-	if responseErr != nil && !*expectedOutput.ExpectError {
+	if responseErr != nil && !expectErr {
 		return fmt.Errorf("failed sending request to destination %+v: %w", dest, responseErr)
 	}
 
 	if notRunningInCloudMode(ftwCheck) {
 		endMarker, err := markAndFlush(runContext, dest, stageID)
-		if err != nil && !*expectedOutput.ExpectError {
+		if err != nil && !expectErr {
 			return fmt.Errorf("failed to find end marker: %w", err)
 
 		}