Merge pull request #6945 from MetRonnie/cat-log-test

Fix cat-log test timing out

Author: oliver-sanders

cylc/flow/remote.py

@@ -83,8 +83,10 @@ def get_proc_ancestors():
 def watch_and_kill(proc):
     """Kill proc if my PPID (etc.) changed - e.g. ssh connection dropped."""
     gpa = get_proc_ancestors()
+    # Allow customising the interval to allow tests to run faster:
+    interval = float(os.getenv('CYLC_PROC_POLL_INTERVAL', 60))
     while True:
-        sleep(60)
+        sleep(interval)
         if proc.poll() is not None:
             break
         if get_proc_ancestors() != gpa:

tests/functional/cylc-cat-log/12-delete-kill.t

@@ -33,6 +33,8 @@ __EOF__
 log_file="${WORKFLOW_RUN_DIR}/log/foo.log"
 echo "Hello, Mr. Thompson" > "$log_file"
 
+export CYLC_PROC_POLL_INTERVAL=0.5
+
 TEST_NAME="${TEST_NAME_BASE}-delete"
 cylc cat-log --mode=tail "$WORKFLOW_NAME" -f foo.log 2>&1 &
 cat_log_pid="$!"