Fixed issue with race conditions in test further up the stack.

pb33f · Apr 21, 2024 · 6035624 · 6035624
1 parent 016b8cd
commit 6035624
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/schema_validation/locate_schema_property.go b/schema_validation/locate_schema_property.go
@@ -14,6 +14,7 @@ import (
 func LocateSchemaPropertyNodeByJSONPath(doc *yaml.Node, JSONPath string) *yaml.Node {
 	var locatedNode *yaml.Node
 	doneChan := make(chan bool)
+	locatedNodeChan := make(chan *yaml.Node)
 	go func() {
 		defer func() {
 			if err := recover(); err != nil {
@@ -30,8 +31,12 @@ func LocateSchemaPropertyNodeByJSONPath(doc *yaml.Node, JSONPath string) *yaml.N
 		if len(locatedNodes) > 0 {
 			locatedNode = locatedNodes[0]
 		}
-		doneChan <- true
+		locatedNodeChan <- locatedNode
 	}()
-	<-doneChan
-	return locatedNode
+	select {
+	case locatedNode = <-locatedNodeChan:
+		return locatedNode
+	case <-doneChan:
+		return nil
+	}
 }