fix: fail fast may cause Serial spec or cleanup Node interrupted

onsi · Apr 4, 2023 · 2a8be0e · 2a8be0e
1 parent 227c662
commit 2a8be0e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/internal/interrupt_handler/interrupt_handler.go b/internal/interrupt_handler/interrupt_handler.go
@@ -45,6 +45,10 @@ type InterruptStatus struct {
 	Cause   InterruptCause
 }
 
+func (s InterruptStatus) BlockForUpdate() {
+	<-time.After(ABORT_POLLING_INTERVAL)
+}
+
 func (s InterruptStatus) Interrupted() bool {
 	return s.Level != InterruptLevelUninterrupted
 }

diff --git a/internal/suite.go b/internal/suite.go
@@ -451,6 +451,7 @@ func (suite *Suite) runSpecs(description string, suiteLabels Labels, suitePath s
 				if suite.config.ParallelProcess == 1 && len(serialGroupedSpecIndices) > 0 {
 					groupedSpecIndices, serialGroupedSpecIndices, nextIndex = serialGroupedSpecIndices, GroupedSpecIndices{}, MakeIncrementingIndexCounter()
 					suite.client.BlockUntilNonprimaryProcsHaveFinished()
+					suite.interruptHandler.Status().BlockForUpdate()
 					continue
 				}
 				break
@@ -937,6 +938,12 @@ func (suite *Suite) runNode(node Node, specDeadline time.Time, text string) (typ
 			gracePeriodChannel = time.After(gracePeriod)
 		case <-interruptStatus.Channel:
 			interruptStatus = suite.interruptHandler.Status()
+			// ignored interruption from other process if we are cleaning up or reporting
+			if interruptStatus.Cause == interrupt_handler.InterruptCauseAbortByOtherProcess &&
+				node.NodeType.Is(types.NodeTypesAllowedDuringReportInterrupt|types.NodeTypesAllowedDuringCleanupInterrupt) {
+				continue
+			}
+
 			deadlineChannel = nil // don't worry about deadlines, time's up now
 
 			failureTimelineLocation := suite.generateTimelineLocation()