Use ExecuteAndGetStatus to deliver Concept Start and End notification

Signed-off-by: Piotr Nestorow <[email protected]>
getgauge · Feb 14, 2024 · af22569 · af22569
1 parent 47ff86b
commit af22569
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/execution/scenarioExecutor.go b/execution/scenarioExecutor.go
@@ -145,14 +145,14 @@ func (e *scenarioExecutor) notifyBeforeConcept(conceptResult *result.ScenarioRes
 	message := &gauge_messages.Message{MessageType: gauge_messages.Message_ConceptExecutionStarting,
 		ConceptExecutionStartingRequest: &gauge_messages.ConceptExecutionStartingRequest{CurrentExecutionInfo: e.currentExecutionInfo, Stream: int32(e.stream)}}
 	e.pluginHandler.NotifyPlugins(message)
-	e.runner.ExecuteMessageWithTimeout(message)
+	_ = e.runner.ExecuteAndGetStatus(message)
 }
 
 func (e *scenarioExecutor) notifyAfterConcept(conceptResult *result.ScenarioResult) {
 	message := &gauge_messages.Message{MessageType: gauge_messages.Message_ConceptExecutionEnding,
 		ConceptExecutionEndingRequest: &gauge_messages.ConceptExecutionEndingRequest{CurrentExecutionInfo: e.currentExecutionInfo, Stream: int32(e.stream)}}
 	e.pluginHandler.NotifyPlugins(message)
-	e.runner.ExecuteMessageWithTimeout(message)
+	_ = e.runner.ExecuteAndGetStatus(message)
 }
 
 func (e *scenarioExecutor) createStepRequest(protoStep *gauge_messages.ProtoStep) *gauge_messages.ExecuteStepRequest {

diff --git a/runner/grpcRunner.go b/runner/grpcRunner.go
@@ -227,7 +227,7 @@ func (r *GrpcRunner) ExecuteAndGetStatus(m *gm.Message) *gm.ProtoExecutionResult
 		}
 		return &gauge_messages.ProtoExecutionResult{Failed: true, ErrorMessage: err.Error()}
 	}
-	return res.ExecutionStatusResponse.ExecutionResult
+	if res != nil { return res.ExecutionStatusResponse.ExecutionResult } else { return nil }
 }
 
 // Alive check if the runner process is still alive