Add ExecutionStatusInterrupted, set it in ExecutionScheduler.Run

This is needed to be able to read the test run status via the API, e.g. in the Cloud.
grafana · Jan 10, 2022 · bc403e7 · bc403e7
1 parent 1ad2e74
commit bc403e7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/core/local/local.go b/core/local/local.go
@@ -348,7 +348,13 @@ func (e *ExecutionScheduler) Run(
 	executorsCount := len(e.executors)
 	logger := e.logger.WithField("phase", "local-execution-scheduler-run")
 	e.initProgress.Modify(pb.WithConstLeft("Run"))
-	defer e.state.MarkEnded()
+	var interrupted bool
+	defer func() {
+		e.state.MarkEnded()
+		if interrupted {
+			e.state.SetExecutionStatus(lib.ExecutionStatusInterrupted)
+		}
+	}()
 
 	if e.state.IsPaused() {
 		logger.Debug("Execution is paused, waiting for resume or interrupt...")
@@ -423,7 +429,7 @@ func (e *ExecutionScheduler) Run(
 		}
 	}
 	if err := executor.CancelReason(execCtx); err != nil && common.IsInterruptError(err) {
-		// The execution was interupted
+		interrupted = true
 		return err
 	}
 	return firstErr

diff --git a/lib/execution.go b/lib/execution.go
@@ -123,6 +123,7 @@ const (
 	ExecutionStatusRunning
 	ExecutionStatusTeardown
 	ExecutionStatusEnded
+	ExecutionStatusInterrupted
 )
 
 // ExecutionState contains a few different things:

diff --git a/lib/execution_status_gen.go b/lib/execution_status_gen.go