Merge pull request #73 from MetRonnie/platform-subshell-2

Tidy test

Author: wxtim

tests/functional/platforms/12-ping-pong.t

@@ -19,33 +19,23 @@
 # If a task has a platform set using a subshell this should be evaluated
 # every time the task is run.
 # https://github.com/cylc/cylc-flow/issues/6808
-export REQUIRE_PLATFORM='loc:remote fs:indep'
+export REQUIRE_PLATFORM='loc:remote'
 
 . "$(dirname "$0")/test_header"
 
 set_test_number 3
 
-create_test_global_config "" "
-    [platforms]
-        [[${CYLC_TEST_HOST}]]
-            hosts = ${CYLC_TEST_HOST}
-            install target = ${CYLC_TEST_HOST}
-"
-
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
-cat > var_file <<__HERE__
-REMOTE_HOST="${CYLC_TEST_HOST}"
-__HERE__
-
 workflow_run_ok "${TEST_NAME_BASE}-run" \
-    cylc play "${WORKFLOW_NAME}" --debug --no-detach --set-file var_file
+    cylc play "${WORKFLOW_NAME}" --debug --no-detach
 
-named_grep_ok "1/remote_task submits to ${CYLC_TEST_HOST}" \
-    "\[1/remote_task/01:preparing\] submitted to ${CYLC_TEST_HOST}" \
+named_grep_ok "1/remote_task submits to ${CYLC_TEST_PLATFORM}" \
+    "\[1/remote_task/01:preparing\] submitted to ${CYLC_TEST_PLATFORM}" \
     "${WORKFLOW_RUN_DIR}/log/scheduler/log"
 
 named_grep_ok "2/remote_task submits to localhost" \
     "\[2/remote_task/01:preparing\] submitted to localhost" \
     "${WORKFLOW_RUN_DIR}/log/scheduler/log"
 
+purge

tests/functional/platforms/12-ping-pong/flow.cylc

@@ -16,29 +16,16 @@
     [[toggler]]
         script = """
             # Toggle the platform between localhost and the remote host
-            # using the content of a file, ${TEST_DIR}/pretend-hall-info.
+            # using the content of a file, ${CYLC_WORKFLOW_RUN_DIR}/pretend-hall-info.
             # between localhost and the remote.
 
-            A="localhost"
-            B="${REMOTE_HOST}"
-
-            # Create pretend-hall-info file if it does not exist
-            if [[ ! -f ${TEST_DIR}/pretend-hall-info ]]; then
-                echo "localhost" > ${TEST_DIR}/pretend-hall-info
-            fi
-
-            # Read the current platform from the file and toggle it
-            this=$(cat ${TEST_DIR}/pretend-hall-info)
-            echo ${TEST_DIR} $this
-            echo "content of pretent-hall-info: $(cat ${TEST_DIR}/pretend-hall-info)"
-            if [[ $this == "localhost" ]]; then
-                echo ${REMOTE_HOST} > ${TEST_DIR}/pretend-hall-info
-                cylc message -- "WARNING:changing platform to ${REMOTE_HOST}"
+            if (( $CYLC_TASK_CYCLE_POINT % 2 == 1 )); then
+                echo ${REMOTE_PLATFORM} > ${CYLC_WORKFLOW_RUN_DIR}/pretend-hall-info
+                cylc message -- "changing platform to ${REMOTE_PLATFORM}"
             else
-                echo "localhost" > ${TEST_DIR}/pretend-hall-info
-                cylc message -- "WARNING:changing platform to localhost"
+                echo "localhost" > ${CYLC_WORKFLOW_RUN_DIR}/pretend-hall-info
+                cylc message -- "changing platform to localhost"
             fi
         """
         [[[environment]]]
-            REMOTE_HOST = {{ CYLC_TEST_HOST }}
-            TEST_DIR = ${CYLC_WORKFLOW_RUN_DIR}
+            REMOTE_PLATFORM = {{ CYLC_TEST_PLATFORM }}