Improve test

Author: MetRonnie

tests/functional/cylc-combination-scripts/09-vr-icp-now.t

@@ -16,7 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #------------------------------------------------------------------------------
-# Ensure that validate step of Cylc VR cannot change the options object.
+# Ensure that validate step of `cylc vr` does not set the --icp option for the
+# restart step, as this would cause an InputError.
 # See https://github.com/cylc/cylc-flow/issues/6262
 
 . "$(dirname "$0")/test_header"
@@ -26,14 +27,13 @@ WORKFLOW_ID=$(workflow_id)
 
 cp -r "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/flow.cylc" .
 
-run_ok "${TEST_NAME_BASE}-vip" \
-    cylc vip . \
-        --workflow-name "${WORKFLOW_ID}" \
-        --no-detach \
-        --no-run-name
+run_ok "${TEST_NAME_BASE}-vip" cylc vip . \
+    --workflow-name "${WORKFLOW_ID}" \
+    --no-detach \
+    --no-run-name \
+    --mode simulation
 
 echo "# Some Comment" >> flow.cylc
 
 run_ok "${TEST_NAME_BASE}-vr" \
-    cylc vr "${WORKFLOW_ID}" \
-        --stop-cycle-point 2020-01-01T00:02Z
+    cylc vr "${WORKFLOW_ID}" --no-detach --mode simulation

tests/functional/cylc-combination-scripts/09-vr-icp-now/flow.cylc

@@ -1,8 +1,11 @@
+[scheduler]
+    [[events]]
+        restart timeout = PT0S
 [scheduling]
     initial cycle point = 2020
-    stop after cycle point = 2020-01-01T00:01Z
+    final cycle point = 2020
     [[graph]]
-        PT1M = foo
+        P1Y = foo
 [runtime]
     [[foo]]
         [[[simulation]]]