Fix test

wxtim · Dec 10, 2024 · 50a676a · 50a676a
1 parent 2236a70
commit 50a676a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/tests/functional/cylc-combination-scripts/01-vr-reload.t b/tests/functional/cylc-combination-scripts/01-vr-reload.t
@@ -30,12 +30,15 @@ run_ok "setup (vip)" \
     cylc vip --debug \
     --workflow-name "${WORKFLOW_NAME}" \
     --no-run-name
+
 export WORKFLOW_RUN_DIR="${RUN_DIR}/${WORKFLOW_NAME}"
+
 poll_workflow_running
 
+# Change something so that reinstall does something material:
+echo "# Hello World" >> "flow.cylc"
 
 # It validates and reloads:
-
 run_ok "${TEST_NAME_BASE}-runs" cylc vr "${WORKFLOW_NAME}"
 
 # Grep for VR reporting revalidation, reinstallation and reloading

diff --git a/tests/functional/cylc-combination-scripts/02-vr-restart.t b/tests/functional/cylc-combination-scripts/02-vr-restart.t
@@ -19,7 +19,6 @@
 # Test `cylc vr` (Validate Reinstall restart)
 # In this case the target workflow is stopped so cylc play is run.
 
-
 . "$(dirname "$0")/test_header"
 set_test_number 6
 
@@ -32,8 +31,10 @@ run_ok "setup (install)" \
 
 export WORKFLOW_RUN_DIR="${RUN_DIR}/${WORKFLOW_NAME}"
 
-# It validates and restarts:
+# Change something so that reinstall does something material:
+echo "# Hello World" >> "flow.cylc"
 
+# It validates and restarts:
 # Run VR
 run_ok "${TEST_NAME_BASE}-runs" cylc vr "${WORKFLOW_NAME}"
 

diff --git a/tests/functional/cylc-combination-scripts/04-vr-fail-validate.t b/tests/functional/cylc-combination-scripts/04-vr-fail-validate.t
@@ -30,9 +30,7 @@ run_ok "setup (vip)" \
     --workflow-name "${WORKFLOW_NAME}" \
     --no-run-name
 
-
 # Change source workflow and run vr:
-
 # Cut the runtime section out of the source flow.
 head -n 5 > tmp < flow.cylc
 cat tmp > flow.cylc

diff --git a/tests/functional/cylc-combination-scripts/vr_workflow/flow.cylc b/tests/functional/cylc-combination-scripts/vr_workflow/flow.cylc
@@ -5,4 +5,4 @@
 
 [runtime]
     [[foo]]
-        script = cylc pause ${WORKFLOW_ID}
+        script = cylc pause ${CYLC_WORKFLOW_ID}