tools/flow: enable matrix tests

Fixes in dep have fixed these tests. See https://review.gerrithub.io/c/cue-lang/cue/+/1194445 Issue #3060 Signed-off-by: Marcel van Lohuizen <mpvl@gmail.com> Change-Id: Ifee32c22b69172fbad51fd53c1f0c2996703bb47
cue-lang · May 8, 2024 · aba0cd3 · aba0cd3
1 parent a651ed4
commit aba0cd3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 100 deletions.
diff --git a/tools/flow/flow_test.go b/tools/flow/flow_test.go
@@ -44,7 +44,7 @@ func TestFlow(t *testing.T) {
 		// of whack, causing the test to become flaky. We revert to the default
 		// evaluator for now. Switch back to SmallMatrix when the tests are
 		// fixed for the new evaluator.
-		Matrix: cuetdtest.DefaultOnlyMatrix, // SmallMatrix,
+		Matrix: cuetdtest.SmallMatrix,
 	}
 
 	test.Run(t, func(t *cuetxtar.Test) {

diff --git a/tools/flow/testdata/dynamic.txtar b/tools/flow/testdata/dynamic.txtar
@@ -35,24 +35,28 @@ graph TD
   t1("root.b [Waiting]")
   t1-->t0
 
--- out/run-v3/t1 --
+-- out/run/t1 --
 graph TD
   t0("root.a [Terminated]")
-  t1("root.b [Ready]")
+  t1("root.b [Waiting]")
   t1-->t0
+  t1-->t2
   t2("root.middle.la2 [Ready]")
+  t2-->t0
 
 -- out/run/t1/value --
 {
 	$id: "list"
 	out: [1, 2]
 }
--- out/run-v3/t2 --
+-- out/run/t2 --
 graph TD
   t0("root.a [Terminated]")
-  t1("root.b [Running]")
+  t1("root.b [Ready]")
   t1-->t0
+  t1-->t2
   t2("root.middle.la2 [Terminated]")
+  t2-->t0
 
 -- out/run/t2/value --
 {
@@ -61,13 +65,16 @@ graph TD
 	out: "foo2"
 	val: "foo2"
 }
--- out/run-v3/t3 --
+-- out/run/t3 --
 graph TD
   t0("root.a [Terminated]")
   t1("root.b [Terminated]")
   t1-->t0
+  t1-->t2
   t2("root.middle.la2 [Terminated]")
+  t2-->t0
   t3("root.after.lb2 [Ready]")
+  t3-->t1
 
 -- out/run/t3/value --
 {
@@ -80,100 +87,6 @@ graph TD
 	}]
 	out: [1, 2]
 }
--- out/run-v3/t4 --
-graph TD
-  t0("root.a [Terminated]")
-  t1("root.b [Terminated]")
-  t1-->t0
-  t2("root.middle.la2 [Terminated]")
-  t3("root.after.lb2 [Terminated]")
-
--- diff/-out/run-v3/t1<==>+out/run/t1 --
-diff old new
---- old
-+++ new
-@@ -1,8 +1,6 @@
- graph TD
-   t0("root.a [Terminated]")
--  t1("root.b [Waiting]")
-+  t1("root.b [Ready]")
-   t1-->t0
--  t1-->t2
-   t2("root.middle.la2 [Ready]")
--  t2-->t0
-
--- diff/-out/run-v3/t2<==>+out/run/t2 --
-diff old new
---- old
-+++ new
-@@ -1,8 +1,6 @@
- graph TD
-   t0("root.a [Terminated]")
--  t1("root.b [Ready]")
-+  t1("root.b [Running]")
-   t1-->t0
--  t1-->t2
-   t2("root.middle.la2 [Terminated]")
--  t2-->t0
-
--- diff/-out/run-v3/t3<==>+out/run/t3 --
-diff old new
---- old
-+++ new
-@@ -2,9 +2,6 @@
-   t0("root.a [Terminated]")
-   t1("root.b [Terminated]")
-   t1-->t0
--  t1-->t2
-   t2("root.middle.la2 [Terminated]")
--  t2-->t0
-   t3("root.after.lb2 [Ready]")
--  t3-->t1
-
--- diff/-out/run-v3/t4<==>+out/run/t4 --
-diff old new
---- old
-+++ new
-@@ -2,9 +2,6 @@
-   t0("root.a [Terminated]")
-   t1("root.b [Terminated]")
-   t1-->t0
--  t1-->t2
-   t2("root.middle.la2 [Terminated]")
--  t2-->t0
-   t3("root.after.lb2 [Terminated]")
--  t3-->t1
--- diff/out/todo/p1 --
-Investigate changes.
--- out/run/t1 --
-graph TD
-  t0("root.a [Terminated]")
-  t1("root.b [Waiting]")
-  t1-->t0
-  t1-->t2
-  t2("root.middle.la2 [Ready]")
-  t2-->t0
-
--- out/run/t2 --
-graph TD
-  t0("root.a [Terminated]")
-  t1("root.b [Ready]")
-  t1-->t0
-  t1-->t2
-  t2("root.middle.la2 [Terminated]")
-  t2-->t0
-
--- out/run/t3 --
-graph TD
-  t0("root.a [Terminated]")
-  t1("root.b [Terminated]")
-  t1-->t0
-  t1-->t2
-  t2("root.middle.la2 [Terminated]")
-  t2-->t0
-  t3("root.after.lb2 [Ready]")
-  t3-->t1
-
 -- out/run/t4 --
 graph TD
   t0("root.a [Terminated]")