0001-Extra-tweak-for-injection-test-permutation.patch

From 8f7d244eddd965c4e4725cc88257292ee65214d2 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Fri, 7 Feb 2025 13:36:40 +0900
Subject: [PATCH] Extra tweak for injection test permutation

---
 src/test/modules/injection_points/expected/basic.out | 3 ++-
 src/test/modules/injection_points/specs/basic.spec   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/modules/injection_points/expected/basic.out b/src/test/modules/injection_points/expected/basic.out
index 840ce2dac90..4fc218ed00d 100644
--- a/src/test/modules/injection_points/expected/basic.out
+++ b/src/test/modules/injection_points/expected/basic.out
@@ -1,6 +1,6 @@
 Parsed test spec with 2 sessions
 
-starting permutation: wait1 wakeup2 detach2
+starting permutation: wait1 wakeup2 noop1 detach2
 injection_points_attach
 -----------------------
                        
@@ -19,6 +19,7 @@ injection_points_run
                     
 (1 row)
 
+step noop1: 
 step detach2: SELECT injection_points_detach('injection-points-wait');
 injection_points_detach
 -----------------------
diff --git a/src/test/modules/injection_points/specs/basic.spec b/src/test/modules/injection_points/specs/basic.spec
index 753128e7f36..13d2793f6e4 100644
--- a/src/test/modules/injection_points/specs/basic.spec
+++ b/src/test/modules/injection_points/specs/basic.spec
@@ -20,6 +20,7 @@ setup	{
 	SELECT injection_points_attach('injection-points-wait', 'wait');
 }
 step wait1	{ SELECT injection_points_run('injection-points-wait'); }
+step noop1	{ }
 
 session s2
 step wakeup2	{ SELECT injection_points_wakeup('injection-points-wait'); }
@@ -27,9 +28,9 @@ step detach2	{ SELECT injection_points_detach('injection-points-wait'); }
 
 # Detach after wait and wakeup.  Note that the detach may finish before
 # the SQL function doing the wait returns its result.  In order to avoid
-# any ordering issues, the detach step reports its result only once the
-# wait has completed.  This is enforced with a parenthesized marker.
-permutation wait1 wakeup2 detach2(wait1)
+# any ordering issues, a no-op step is added after the wait, so as the
+# detach is not launched until the wait has completed.
+permutation wait1 wakeup2 noop1 detach2
 
 # Detach before wakeup.  s1 waits until wakeup, ignores the detach.
 permutation wait1 detach2 wakeup2
-- 
2.47.2