tests: co-locate functional, integration and unit tests

cylc · Jun 12, 2020 · f56cf74 · f56cf74
1 parent 8e98a44
commit f56cf74
Show file tree

Hide file tree

Showing 1,894 changed files with 43 additions and 82 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -2,6 +2,5 @@ exclude_paths:
   - 'conf/**'
   - 'doc/joss-paper/**'
   - 'etc/**'
-  - 'cylc/flow/tests/**'
   - 'tests/**'
   - 'cylc/flow/**_pb2.py'
diff --git a/.codecov.yml b/.codecov.yml
@@ -40,7 +40,7 @@ coverage:
 
 # files to ignore
 ignore:
-  - "tests/**/*.py"
+  - "tests/**"
   - "ws_messages_pb2.py"
 
 # turn off comments to pull requests

diff --git a/.coveragerc b/.coveragerc
@@ -29,11 +29,10 @@ debug=
 #include
 note=
 omit=
-    */cylc/flow/tests/*
+    tests/*
     */cylc/flow/profiler.py
     */cylc/flow/profiling/*
     */cylc/flow/parsec/OrderedDictCompat.py
-    */cylc/flow/parsec/tests/*
     */cylc/flow/*_pb2.py
 parallel = True
 plugins=
@@ -55,11 +54,10 @@ fail_under=0
 ignore_errors = False
 include=
 omit=
-    */cylc/flow/tests/*
+    tests/*
     */cylc/flow/profiler.py
     */cylc/flow/profiling/*
     */cylc/flow/parsec/OrderedDictCompat.py
-    */cylc/flow/parsec/tests/*
     */cylc/flow/*_pb2.py
 partial_branches=
 precision=2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,11 +43,11 @@ jobs:
       matrix:
         python-version: ['3.7']
         tests: [
-          ['tests', '1/4'],
-          ['tests', '2/4'],
-          ['tests', '3/4'],
-          ['tests', '4/4'],
-          ['flakytests', '1/1']
+          ['tests/f', '1/4'],
+          ['tests/f', '2/4'],
+          ['tests/f', '3/4'],
+          ['tests/f', '4/4'],
+          ['tests/k', '1/1']
         ]
     env:
       BASE: ${{ matrix.tests[0] }}
@@ -72,7 +72,7 @@ jobs:
 
       - name: Test
         run: |
-          if [[ "${BASE}" == 'flakytests' ]]; then
+          if [[ "${BASE}" == 'tests/k' ]]; then
               NPROC=4
           else
               NPROC=8

diff --git a/cylc/flow/hostuserutil.py b/cylc/flow/hostuserutil.py
@@ -113,7 +113,7 @@ def _get_host_info(self, target=None):
         """Return the extended info of the current host."""
         if target not in self._host_exs:
             if target is None:
-                target = socket.getfqdn()
+                target = socket.gethostname()
             try:
                 self._host_exs[target] = socket.gethostbyname_ex(target)
             except IOError as exc:

diff --git a/etc/bin/run-functional-tests b/etc/bin/run-functional-tests
@@ -22,7 +22,7 @@ Usage: run-functional-tests [...]
 
 Run the Cylc test battery, in <CYLC_REPO_DIR>/tests.
 
-Options and arguments are appended to "prove -j \$NPROC -s -r \${@:-tests}".
+Options and arguments are appended to "prove -j \$NPROC -s -r \${@:-tests/f}".
 NPROC is the number of concurrent processes to run, which defaults to the
 global config "process pool size" setting.
 
@@ -68,13 +68,13 @@ Run the full test suite with the default options.
   run-functional-tests
 Run the full test suite with 12 processes
   run-functional-tests -j 12
-Run only tests under "tests/cyclers/"
-  run-functional-tests tests/cyclers
-Run only "tests/cyclers/16-weekly.t" in verbose mode
-  run-functional-tests -v tests/cyclers/16-weekly.t
-Run only tests under "tests/cyclers/", and skip 00-daily.t
-  export CYLC_TEST_SKIP=tests/cyclers/00-daily.t
-  run-functional-tests tests/cyclers
+Run only tests under "tests/f/cyclers/"
+  run-functional-tests tests/f/cyclers
+Run only "tests/f/cyclers/16-weekly.t" in verbose mode
+  run-functional-tests -v tests/f/cyclers/16-weekly.t
+Run only tests under "tests/f/cyclers/", and skip 00-daily.t
+  export CYLC_TEST_SKIP=tests/f/cyclers/00-daily.t
+  run-functional-tests tests/f/cyclers
 Run the first quarter of the test battery
   CHUNK=1/4 run-functional-tests
 Re-run failed tests
@@ -125,7 +125,7 @@ export CYLC_REPO_DIR="${PWD}"
 
 # default test base
 if [[ ${#TESTS[@]} -eq 0 ]]; then
-    TESTS=('tests')
+    TESTS=('tests/functional')
 fi
 
 # handle chunking

diff --git a/etc/bin/shellchecker b/etc/bin/shellchecker
@@ -76,7 +76,7 @@ default () {
     # run a strict check on all "functional" scripts
     main '.' \
         --exclude 'etc/bin/live-graph-movie.sh' \
-        --exclude 'tests/jobscript/00-torture/foo.ref-jobfile' \
+        --exclude 'tests/functional/jobscript/00-torture/foo.ref-jobfile' \
         -- -e SC1090
 }
 

diff --git a/etc/cylc-tests.rst b/etc/cylc-tests.rst
diff --git a/pytest.ini b/pytest.ini
@@ -22,10 +22,9 @@ addopts = --verbose
     --ignore=cylc/flow/parsec/empysupport.py
     --ignore=cylc/flow/parsec/validate.py
     --ignore=cylc/flow/parsec/example
-    --ignore=cylc/flow/tests/parsec/getcfg/bin/one-line.py
-    --ignore=cylc/flow/tests/parsec/synonyms/bin/synonyms.py
-    --ignore=cylc/flow/tests/parsec/nullcfg/bin/empty.py
+    --ignore=tests/unit/parsec/getcfg/bin/one-line.py
+    --ignore=tests/unit/parsec/synonyms/bin/synonyms.py
+    --ignore=tests/unit/parsec/nullcfg/bin/empty.py
     --ignore=cylc/flow/data_messages_pb2.py
 testpaths =
-    cylc/flow/
-    tests/lib/python/
+    tests/unit/
diff --git a/tests/README b/tests/README
diff --git a/tests/f b/tests/f
@@ -0,0 +1 @@
+functional/
diff --git a/flakytests/README.md → tests/flakyfunctional/README.md b/flakytests/README.md → tests/flakyfunctional/README.md
diff --git a/flakytests/cyclers/19-async_integer.t → ...lakyfunctional/cyclers/19-async_integer.t b/flakytests/cyclers/19-async_integer.t → ...lakyfunctional/cyclers/19-async_integer.t
diff --git a/.../cyclers/19-async_integer/graph.plain.ref → .../cyclers/19-async_integer/graph.plain.ref b/.../cyclers/19-async_integer/graph.plain.ref → .../cyclers/19-async_integer/graph.plain.ref
diff --git a/...ts/cyclers/19-async_integer/reference.log → ...al/cyclers/19-async_integer/reference.log b/...ts/cyclers/19-async_integer/reference.log → ...al/cyclers/19-async_integer/reference.log
diff --git a/flakytests/cyclers/19-async_integer/suite.rc → ...ctional/cyclers/19-async_integer/suite.rc b/flakytests/cyclers/19-async_integer/suite.rc → ...ctional/cyclers/19-async_integer/suite.rc
diff --git a/flakytests/cyclers/30-r1_at_icp_or.t → ...flakyfunctional/cyclers/30-r1_at_icp_or.t b/flakytests/cyclers/30-r1_at_icp_or.t → ...flakyfunctional/cyclers/30-r1_at_icp_or.t
diff --git a/...s/cyclers/30-r1_at_icp_or/graph.plain.ref → ...l/cyclers/30-r1_at_icp_or/graph.plain.ref b/...s/cyclers/30-r1_at_icp_or/graph.plain.ref → ...l/cyclers/30-r1_at_icp_or/graph.plain.ref
diff --git a/...sts/cyclers/30-r1_at_icp_or/reference.log → ...nal/cyclers/30-r1_at_icp_or/reference.log b/...sts/cyclers/30-r1_at_icp_or/reference.log → ...nal/cyclers/30-r1_at_icp_or/reference.log
diff --git a/flakytests/cyclers/30-r1_at_icp_or/suite.rc → ...nctional/cyclers/30-r1_at_icp_or/suite.rc b/flakytests/cyclers/30-r1_at_icp_or/suite.rc → ...nctional/cyclers/30-r1_at_icp_or/suite.rc
diff --git a/flakytests/cyclers/test_header → tests/flakyfunctional/cyclers/test_header b/flakytests/cyclers/test_header → tests/flakyfunctional/cyclers/test_header
diff --git a/...ts/cylc-get-config/04-dummy-mode-output.t → ...al/cylc-get-config/04-dummy-mode-output.t b/...ts/cylc-get-config/04-dummy-mode-output.t → ...al/cylc-get-config/04-dummy-mode-output.t
diff --git a/...config/04-dummy-mode-output/reference.log → ...config/04-dummy-mode-output/reference.log b/...config/04-dummy-mode-output/reference.log → ...config/04-dummy-mode-output/reference.log
diff --git a/...-get-config/04-dummy-mode-output/suite.rc → ...-get-config/04-dummy-mode-output/suite.rc b/...-get-config/04-dummy-mode-output/suite.rc → ...-get-config/04-dummy-mode-output/suite.rc
diff --git a/flakytests/cylc-get-config/test_header → ...akyfunctional/cylc-get-config/test_header b/flakytests/cylc-get-config/test_header → ...akyfunctional/cylc-get-config/test_header
diff --git a/flakytests/cylc-kill/02-submitted.t → .../flakyfunctional/cylc-kill/02-submitted.t b/flakytests/cylc-kill/02-submitted.t → .../flakyfunctional/cylc-kill/02-submitted.t
diff --git a/...ests/cylc-kill/02-submitted/reference.log → ...onal/cylc-kill/02-submitted/reference.log b/...ests/cylc-kill/02-submitted/reference.log → ...onal/cylc-kill/02-submitted/reference.log
diff --git a/flakytests/cylc-kill/02-submitted/suite.rc → ...unctional/cylc-kill/02-submitted/suite.rc b/flakytests/cylc-kill/02-submitted/suite.rc → ...unctional/cylc-kill/02-submitted/suite.rc
diff --git a/flakytests/cylc-kill/test_header → tests/flakyfunctional/cylc-kill/test_header b/flakytests/cylc-kill/test_header → tests/flakyfunctional/cylc-kill/test_header
diff --git a/flakytests/cylc-poll/03-poll-all.t → ...s/flakyfunctional/cylc-poll/03-poll-all.t b/flakytests/cylc-poll/03-poll-all.t → ...s/flakyfunctional/cylc-poll/03-poll-all.t
diff --git a/...tests/cylc-poll/03-poll-all/reference.log → ...ional/cylc-poll/03-poll-all/reference.log b/...tests/cylc-poll/03-poll-all/reference.log → ...ional/cylc-poll/03-poll-all/reference.log
diff --git a/flakytests/cylc-poll/03-poll-all/suite.rc → ...functional/cylc-poll/03-poll-all/suite.rc b/flakytests/cylc-poll/03-poll-all/suite.rc → ...functional/cylc-poll/03-poll-all/suite.rc
diff --git a/...tests/cylc-poll/16-execution-time-limit.t → ...ional/cylc-poll/16-execution-time-limit.t b/...tests/cylc-poll/16-execution-time-limit.t → ...ional/cylc-poll/16-execution-time-limit.t
diff --git a/...oll/16-execution-time-limit/reference.log → ...oll/16-execution-time-limit/reference.log b/...oll/16-execution-time-limit/reference.log → ...oll/16-execution-time-limit/reference.log
diff --git a/...ylc-poll/16-execution-time-limit/suite.rc → ...ylc-poll/16-execution-time-limit/suite.rc b/...ylc-poll/16-execution-time-limit/suite.rc → ...ylc-poll/16-execution-time-limit/suite.rc
diff --git a/flakytests/cylc-poll/test_header → tests/flakyfunctional/cylc-poll/test_header b/flakytests/cylc-poll/test_header → tests/flakyfunctional/cylc-poll/test_header
diff --git a/flakytests/cylc-reset/02-output-1.t → .../flakyfunctional/cylc-reset/02-output-1.t b/flakytests/cylc-reset/02-output-1.t → .../flakyfunctional/cylc-reset/02-output-1.t
diff --git a/...ests/cylc-reset/02-output-1/reference.log → ...onal/cylc-reset/02-output-1/reference.log b/...ests/cylc-reset/02-output-1/reference.log → ...onal/cylc-reset/02-output-1/reference.log
diff --git a/flakytests/cylc-reset/02-output-1/suite.rc → ...unctional/cylc-reset/02-output-1/suite.rc b/flakytests/cylc-reset/02-output-1/suite.rc → ...unctional/cylc-reset/02-output-1/suite.rc
diff --git a/flakytests/cylc-reset/03-output-2.t → .../flakyfunctional/cylc-reset/03-output-2.t b/flakytests/cylc-reset/03-output-2.t → .../flakyfunctional/cylc-reset/03-output-2.t
diff --git a/...ests/cylc-reset/03-output-2/reference.log → ...onal/cylc-reset/03-output-2/reference.log b/...ests/cylc-reset/03-output-2/reference.log → ...onal/cylc-reset/03-output-2/reference.log
diff --git a/flakytests/cylc-reset/03-output-2/suite.rc → ...unctional/cylc-reset/03-output-2/suite.rc b/flakytests/cylc-reset/03-output-2/suite.rc → ...unctional/cylc-reset/03-output-2/suite.rc
diff --git a/flakytests/cylc-reset/test_header → tests/flakyfunctional/cylc-reset/test_header b/flakytests/cylc-reset/test_header → tests/flakyfunctional/cylc-reset/test_header
diff --git a/flakytests/cylc-show/00-simple.t → tests/flakyfunctional/cylc-show/00-simple.t b/flakytests/cylc-show/00-simple.t → tests/flakyfunctional/cylc-show/00-simple.t
diff --git a/flakytests/cylc-show/00-simple/reference.log → ...ctional/cylc-show/00-simple/reference.log b/flakytests/cylc-show/00-simple/reference.log → ...ctional/cylc-show/00-simple/reference.log
diff --git a/flakytests/cylc-show/00-simple/suite.rc → ...kyfunctional/cylc-show/00-simple/suite.rc b/flakytests/cylc-show/00-simple/suite.rc → ...kyfunctional/cylc-show/00-simple/suite.rc
diff --git a/flakytests/cylc-show/04-multi.t → tests/flakyfunctional/cylc-show/04-multi.t b/flakytests/cylc-show/04-multi.t → tests/flakyfunctional/cylc-show/04-multi.t
diff --git a/flakytests/cylc-show/04-multi/reference.log → ...nctional/cylc-show/04-multi/reference.log b/flakytests/cylc-show/04-multi/reference.log → ...nctional/cylc-show/04-multi/reference.log
diff --git a/flakytests/cylc-show/04-multi/suite.rc → ...akyfunctional/cylc-show/04-multi/suite.rc b/flakytests/cylc-show/04-multi/suite.rc → ...akyfunctional/cylc-show/04-multi/suite.rc
diff --git a/flakytests/cylc-show/06-prereqs-outputs.t → ...functional/cylc-show/06-prereqs-outputs.t b/flakytests/cylc-show/06-prereqs-outputs.t → ...functional/cylc-show/06-prereqs-outputs.t
diff --git a/...sts/cylc-show/06-prereqs-outputs/suite.rc → ...nal/cylc-show/06-prereqs-outputs/suite.rc b/...sts/cylc-show/06-prereqs-outputs/suite.rc → ...nal/cylc-show/06-prereqs-outputs/suite.rc
diff --git a/flakytests/cylc-show/test_header → tests/flakyfunctional/cylc-show/test_header b/flakytests/cylc-show/test_header → tests/flakyfunctional/cylc-show/test_header
diff --git a/flakytests/cylc-take-checkpoints/00-basic.t → ...nctional/cylc-take-checkpoints/00-basic.t b/flakytests/cylc-take-checkpoints/00-basic.t → ...nctional/cylc-take-checkpoints/00-basic.t
diff --git a/...c-take-checkpoints/00-basic/reference.log → ...c-take-checkpoints/00-basic/reference.log b/...c-take-checkpoints/00-basic/reference.log → ...c-take-checkpoints/00-basic/reference.log
diff --git a/...s/cylc-take-checkpoints/00-basic/suite.rc → ...l/cylc-take-checkpoints/00-basic/suite.rc b/...s/cylc-take-checkpoints/00-basic/suite.rc → ...l/cylc-take-checkpoints/00-basic/suite.rc
diff --git a/flakytests/cylc-take-checkpoints/test_header → ...ctional/cylc-take-checkpoints/test_header b/flakytests/cylc-take-checkpoints/test_header → ...ctional/cylc-take-checkpoints/test_header
diff --git a/flakytests/database/00-simple.t → tests/flakyfunctional/database/00-simple.t b/flakytests/database/00-simple.t → tests/flakyfunctional/database/00-simple.t
diff --git a/flakytests/database/00-simple/schema.out → ...yfunctional/database/00-simple/schema.out b/flakytests/database/00-simple/schema.out → ...yfunctional/database/00-simple/schema.out
diff --git a/...database/00-simple/select-inheritance.out → ...database/00-simple/select-inheritance.out b/...database/00-simple/select-inheritance.out → ...database/00-simple/select-inheritance.out
diff --git a/...atabase/00-simple/select-suite-params.out → ...atabase/00-simple/select-suite-params.out b/...atabase/00-simple/select-suite-params.out → ...atabase/00-simple/select-suite-params.out
diff --git a/...database/00-simple/select-task-events.out → ...database/00-simple/select-task-events.out b/...database/00-simple/select-task-events.out → ...database/00-simple/select-task-events.out
diff --git a/...tabase/00-simple/select-task-job-logs.out → ...tabase/00-simple/select-task-job-logs.out b/...tabase/00-simple/select-task-job-logs.out → ...tabase/00-simple/select-task-job-logs.out
diff --git a/...s/database/00-simple/select-task-pool.out → ...l/database/00-simple/select-task-pool.out b/...s/database/00-simple/select-task-pool.out → ...l/database/00-simple/select-task-pool.out
diff --git a/...database/00-simple/select-task-states.out → ...database/00-simple/select-task-states.out b/...database/00-simple/select-task-states.out → ...database/00-simple/select-task-states.out
diff --git a/flakytests/database/00-simple/suite.rc → ...akyfunctional/database/00-simple/suite.rc b/flakytests/database/00-simple/suite.rc → ...akyfunctional/database/00-simple/suite.rc
diff --git a/flakytests/database/01-broadcast.t → ...s/flakyfunctional/database/01-broadcast.t b/flakytests/database/01-broadcast.t → ...s/flakyfunctional/database/01-broadcast.t
diff --git a/...tests/database/01-broadcast/reference.log → ...ional/database/01-broadcast/reference.log b/...tests/database/01-broadcast/reference.log → ...ional/database/01-broadcast/reference.log
diff --git a/flakytests/database/01-broadcast/suite.rc → ...functional/database/01-broadcast/suite.rc b/flakytests/database/01-broadcast/suite.rc → ...functional/database/01-broadcast/suite.rc
diff --git a/flakytests/database/02-retry.t → tests/flakyfunctional/database/02-retry.t b/flakytests/database/02-retry.t → tests/flakyfunctional/database/02-retry.t
diff --git a/flakytests/database/02-retry/reference.log → ...unctional/database/02-retry/reference.log b/flakytests/database/02-retry/reference.log → ...unctional/database/02-retry/reference.log
diff --git a/flakytests/database/02-retry/suite.rc → ...lakyfunctional/database/02-retry/suite.rc b/flakytests/database/02-retry/suite.rc → ...lakyfunctional/database/02-retry/suite.rc
diff --git a/flakytests/database/test_header → tests/flakyfunctional/database/test_header b/flakytests/database/test_header → tests/flakyfunctional/database/test_header
diff --git a/flakytests/events/01-task.t → tests/flakyfunctional/events/01-task.t b/flakytests/events/01-task.t → tests/flakyfunctional/events/01-task.t
diff --git a/flakytests/events/01-task/bin/handler.sh → ...yfunctional/events/01-task/bin/handler.sh b/flakytests/events/01-task/bin/handler.sh → ...yfunctional/events/01-task/bin/handler.sh
diff --git a/flakytests/events/01-task/events.log → ...flakyfunctional/events/01-task/events.log b/flakytests/events/01-task/events.log → ...flakyfunctional/events/01-task/events.log
diff --git a/flakytests/events/01-task/reference.log → ...kyfunctional/events/01-task/reference.log b/flakytests/events/01-task/reference.log → ...kyfunctional/events/01-task/reference.log
diff --git a/flakytests/events/01-task/suite.rc → ...s/flakyfunctional/events/01-task/suite.rc b/flakytests/events/01-task/suite.rc → ...s/flakyfunctional/events/01-task/suite.rc
diff --git a/flakytests/events/05-timeout-ref-dummy.t → ...yfunctional/events/05-timeout-ref-dummy.t b/flakytests/events/05-timeout-ref-dummy.t → ...yfunctional/events/05-timeout-ref-dummy.t
diff --git a/...events/05-timeout-ref-dummy/reference.log → ...events/05-timeout-ref-dummy/reference.log b/...events/05-timeout-ref-dummy/reference.log → ...events/05-timeout-ref-dummy/reference.log
diff --git a/...ests/events/05-timeout-ref-dummy/suite.rc → ...onal/events/05-timeout-ref-dummy/suite.rc b/...ests/events/05-timeout-ref-dummy/suite.rc → ...onal/events/05-timeout-ref-dummy/suite.rc
diff --git a/flakytests/events/31-dont-stall-succeeded.t → ...nctional/events/31-dont-stall-succeeded.t b/flakytests/events/31-dont-stall-succeeded.t → ...nctional/events/31-dont-stall-succeeded.t
diff --git a/...s/events/31-dont-stall-succeeded/suite.rc → ...l/events/31-dont-stall-succeeded/suite.rc b/...s/events/31-dont-stall-succeeded/suite.rc → ...l/events/31-dont-stall-succeeded/suite.rc
diff --git a/...tests/events/39-task-event-template-all.t → ...ional/events/39-task-event-template-all.t b/...tests/events/39-task-event-template-all.t → ...ional/events/39-task-event-template-all.t
diff --git a/.../39-task-event-template-all/bin/checkargs → .../39-task-event-template-all/bin/checkargs b/.../39-task-event-template-all/bin/checkargs → .../39-task-event-template-all/bin/checkargs
diff --git a/.../39-task-event-template-all/reference.log → .../39-task-event-template-all/reference.log b/.../39-task-event-template-all/reference.log → .../39-task-event-template-all/reference.log
diff --git a/...vents/39-task-event-template-all/suite.rc → ...vents/39-task-event-template-all/suite.rc b/...vents/39-task-event-template-all/suite.rc → ...vents/39-task-event-template-all/suite.rc
diff --git a/...ests/events/40-stall-despite-clock-trig.t → ...onal/events/40-stall-despite-clock-trig.t b/...ests/events/40-stall-despite-clock-trig.t → ...onal/events/40-stall-despite-clock-trig.t
diff --git a/...ents/40-stall-despite-clock-trig/suite.rc → ...ents/40-stall-despite-clock-trig/suite.rc b/...ents/40-stall-despite-clock-trig/suite.rc → ...ents/40-stall-despite-clock-trig/suite.rc
diff --git a/flakytests/events/44-timeout.t → tests/flakyfunctional/events/44-timeout.t b/flakytests/events/44-timeout.t → tests/flakyfunctional/events/44-timeout.t
diff --git a/flakytests/events/44-timeout/bin/sleeper.sh → ...nctional/events/44-timeout/bin/sleeper.sh b/flakytests/events/44-timeout/bin/sleeper.sh → ...nctional/events/44-timeout/bin/sleeper.sh
diff --git a/flakytests/events/44-timeout/suite.rc → ...lakyfunctional/events/44-timeout/suite.rc b/flakytests/events/44-timeout/suite.rc → ...lakyfunctional/events/44-timeout/suite.rc
diff --git a/flakytests/events/test_header → tests/flakyfunctional/events/test_header b/flakytests/events/test_header → tests/flakyfunctional/events/test_header
diff --git a/...ests/execution-time-limit/00-background.t → ...onal/execution-time-limit/00-background.t b/...ests/execution-time-limit/00-background.t → ...onal/execution-time-limit/00-background.t
diff --git a/...on-time-limit/00-background/reference.log → ...on-time-limit/00-background/reference.log b/...on-time-limit/00-background/reference.log → ...on-time-limit/00-background/reference.log
diff --git a/...ecution-time-limit/00-background/suite.rc → ...ecution-time-limit/00-background/suite.rc b/...ecution-time-limit/00-background/suite.rc → ...ecution-time-limit/00-background/suite.rc
diff --git a/flakytests/execution-time-limit/01-at → ...lakyfunctional/execution-time-limit/01-at b/flakytests/execution-time-limit/01-at → ...lakyfunctional/execution-time-limit/01-at
diff --git a/flakytests/execution-time-limit/01-at.t → ...kyfunctional/execution-time-limit/01-at.t b/flakytests/execution-time-limit/01-at.t → ...kyfunctional/execution-time-limit/01-at.t
diff --git a/flakytests/execution-time-limit/04-poll.t → ...functional/execution-time-limit/04-poll.t b/flakytests/execution-time-limit/04-poll.t → ...functional/execution-time-limit/04-poll.t
diff --git a/...xecution-time-limit/04-poll/reference.log → ...xecution-time-limit/04-poll/reference.log b/...xecution-time-limit/04-poll/reference.log → ...xecution-time-limit/04-poll/reference.log
diff --git a/...sts/execution-time-limit/04-poll/suite.rc → ...nal/execution-time-limit/04-poll/suite.rc b/...sts/execution-time-limit/04-poll/suite.rc → ...nal/execution-time-limit/04-poll/suite.rc
diff --git a/flakytests/execution-time-limit/test_header → ...nctional/execution-time-limit/test_header b/flakytests/execution-time-limit/test_header → ...nctional/execution-time-limit/test_header
diff --git a/flakytests/hold-release/13-ready-restart.t → ...unctional/hold-release/13-ready-restart.t b/flakytests/hold-release/13-ready-restart.t → ...unctional/hold-release/13-ready-restart.t
diff --git a/...release/13-ready-restart/bin/my-file-poll → ...release/13-ready-restart/bin/my-file-poll b/...release/13-ready-restart/bin/my-file-poll → ...release/13-ready-restart/bin/my-file-poll
diff --git a/...ts/hold-release/13-ready-restart/suite.rc → ...al/hold-release/13-ready-restart/suite.rc b/...ts/hold-release/13-ready-restart/suite.rc → ...al/hold-release/13-ready-restart/suite.rc
diff --git a/flakytests/hold-release/14-hold-kill.t → ...akyfunctional/hold-release/14-hold-kill.t b/flakytests/hold-release/14-hold-kill.t → ...akyfunctional/hold-release/14-hold-kill.t
diff --git a/...s/hold-release/14-hold-kill/reference.log → ...l/hold-release/14-hold-kill/reference.log b/...s/hold-release/14-hold-kill/reference.log → ...l/hold-release/14-hold-kill/reference.log
diff --git a/...ytests/hold-release/14-hold-kill/suite.rc → ...tional/hold-release/14-hold-kill/suite.rc b/...ytests/hold-release/14-hold-kill/suite.rc → ...tional/hold-release/14-hold-kill/suite.rc
diff --git a/flakytests/hold-release/15-hold-after.t → ...kyfunctional/hold-release/15-hold-after.t b/flakytests/hold-release/15-hold-after.t → ...kyfunctional/hold-release/15-hold-after.t
diff --git a/.../hold-release/15-hold-after/reference.log → .../hold-release/15-hold-after/reference.log b/.../hold-release/15-hold-after/reference.log → .../hold-release/15-hold-after/reference.log
diff --git a/...tests/hold-release/15-hold-after/suite.rc → ...ional/hold-release/15-hold-after/suite.rc b/...tests/hold-release/15-hold-after/suite.rc → ...ional/hold-release/15-hold-after/suite.rc
diff --git a/...ts/hold-release/20-reset-waiting-output.t → ...al/hold-release/20-reset-waiting-output.t b/...ts/hold-release/20-reset-waiting-output.t → ...al/hold-release/20-reset-waiting-output.t
diff --git a/...ase/20-reset-waiting-output/reference.log → ...ase/20-reset-waiting-output/reference.log b/...ase/20-reset-waiting-output/reference.log → ...ase/20-reset-waiting-output/reference.log
diff --git a/...-release/20-reset-waiting-output/suite.rc → ...-release/20-reset-waiting-output/suite.rc b/...-release/20-reset-waiting-output/suite.rc → ...-release/20-reset-waiting-output/suite.rc
diff --git a/flakytests/hold-release/test_header → .../flakyfunctional/hold-release/test_header b/flakytests/hold-release/test_header → .../flakyfunctional/hold-release/test_header
diff --git a/flakytests/integer-cycling/00-satellite.t → ...functional/integer-cycling/00-satellite.t b/flakytests/integer-cycling/00-satellite.t → ...functional/integer-cycling/00-satellite.t
diff --git a/...nteger-cycling/00-satellite/reference.log → ...nteger-cycling/00-satellite/reference.log b/...nteger-cycling/00-satellite/reference.log → ...nteger-cycling/00-satellite/reference.log
diff --git a/...sts/integer-cycling/00-satellite/suite.rc → ...nal/integer-cycling/00-satellite/suite.rc b/...sts/integer-cycling/00-satellite/suite.rc → ...nal/integer-cycling/00-satellite/suite.rc
diff --git a/flakytests/integer-cycling/test_header → ...akyfunctional/integer-cycling/test_header b/flakytests/integer-cycling/test_header → ...akyfunctional/integer-cycling/test_header
diff --git a/flakytests/job-submission/05-activity-log.t → ...nctional/job-submission/05-activity-log.t b/flakytests/job-submission/05-activity-log.t → ...nctional/job-submission/05-activity-log.t
diff --git a/...-submission/05-activity-log/reference.log → ...-submission/05-activity-log/reference.log b/...-submission/05-activity-log/reference.log → ...-submission/05-activity-log/reference.log
diff --git a/...s/job-submission/05-activity-log/suite.rc → ...l/job-submission/05-activity-log/suite.rc b/...s/job-submission/05-activity-log/suite.rc → ...l/job-submission/05-activity-log/suite.rc
diff --git a/...ytests/job-submission/18-check-chunking.t → ...tional/job-submission/18-check-chunking.t b/...ytests/job-submission/18-check-chunking.t → ...tional/job-submission/18-check-chunking.t
diff --git a/flakytests/job-submission/19-chatty.t → ...lakyfunctional/job-submission/19-chatty.t b/flakytests/job-submission/19-chatty.t → ...lakyfunctional/job-submission/19-chatty.t
diff --git a/...-submission/19-chatty/bin/talkingnonsense → ...-submission/19-chatty/bin/talkingnonsense b/...-submission/19-chatty/bin/talkingnonsense → ...-submission/19-chatty/bin/talkingnonsense
diff --git a/flakytests/job-submission/19-chatty/suite.rc → ...ctional/job-submission/19-chatty/suite.rc b/flakytests/job-submission/19-chatty/suite.rc → ...ctional/job-submission/19-chatty/suite.rc
diff --git a/flakytests/job-submission/test_header → ...lakyfunctional/job-submission/test_header b/flakytests/job-submission/test_header → ...lakyfunctional/job-submission/test_header
diff --git a/flakytests/lib → tests/flakyfunctional/lib b/flakytests/lib → tests/flakyfunctional/lib
diff --git a/flakytests/modes/03-dummy-env.t → tests/flakyfunctional/modes/03-dummy-env.t b/flakytests/modes/03-dummy-env.t → tests/flakyfunctional/modes/03-dummy-env.t
diff --git a/flakytests/modes/03-dummy-env/reference.log → ...nctional/modes/03-dummy-env/reference.log b/flakytests/modes/03-dummy-env/reference.log → ...nctional/modes/03-dummy-env/reference.log
diff --git a/flakytests/modes/03-dummy-env/suite.rc → ...akyfunctional/modes/03-dummy-env/suite.rc b/flakytests/modes/03-dummy-env/suite.rc → ...akyfunctional/modes/03-dummy-env/suite.rc
diff --git a/flakytests/modes/test_header → tests/flakyfunctional/modes/test_header b/flakytests/modes/test_header → tests/flakyfunctional/modes/test_header
diff --git a/flakytests/registration/02-on-the-fly.t → ...kyfunctional/registration/02-on-the-fly.t b/flakytests/registration/02-on-the-fly.t → ...kyfunctional/registration/02-on-the-fly.t
diff --git a/flakytests/registration/test_header → .../flakyfunctional/registration/test_header b/flakytests/registration/test_header → .../flakyfunctional/registration/test_header
diff --git a/flakytests/restart/14-multicycle.t → ...s/flakyfunctional/restart/14-multicycle.t b/flakytests/restart/14-multicycle.t → ...s/flakyfunctional/restart/14-multicycle.t
diff --git a/.../14-multicycle/bin/ctb-select-task-states → .../14-multicycle/bin/ctb-select-task-states b/.../14-multicycle/bin/ctb-select-task-states → .../14-multicycle/bin/ctb-select-task-states
diff --git a/flakytests/restart/14-multicycle/suite.rc → ...functional/restart/14-multicycle/suite.rc b/flakytests/restart/14-multicycle/suite.rc → ...functional/restart/14-multicycle/suite.rc
diff --git a/flakytests/restart/19-checkpoint.t → ...s/flakyfunctional/restart/19-checkpoint.t b/flakytests/restart/19-checkpoint.t → ...s/flakyfunctional/restart/19-checkpoint.t
diff --git a/...tests/restart/19-checkpoint/reference.log → ...ional/restart/19-checkpoint/reference.log b/...tests/restart/19-checkpoint/reference.log → ...ional/restart/19-checkpoint/reference.log
diff --git a/flakytests/restart/19-checkpoint/suite.rc → ...functional/restart/19-checkpoint/suite.rc b/flakytests/restart/19-checkpoint/suite.rc → ...functional/restart/19-checkpoint/suite.rc
diff --git a/flakytests/restart/19-checkpoint/suite2.rc → ...unctional/restart/19-checkpoint/suite2.rc b/flakytests/restart/19-checkpoint/suite2.rc → ...unctional/restart/19-checkpoint/suite2.rc
diff --git a/flakytests/restart/21-task-elapsed.t → ...flakyfunctional/restart/21-task-elapsed.t b/flakytests/restart/21-task-elapsed.t → ...flakyfunctional/restart/21-task-elapsed.t
diff --git a/...sts/restart/21-task-elapsed/reference.log → ...nal/restart/21-task-elapsed/reference.log b/...sts/restart/21-task-elapsed/reference.log → ...nal/restart/21-task-elapsed/reference.log
diff --git a/flakytests/restart/21-task-elapsed/suite.rc → ...nctional/restart/21-task-elapsed/suite.rc b/flakytests/restart/21-task-elapsed/suite.rc → ...nctional/restart/21-task-elapsed/suite.rc
diff --git a/...estart/39-auto-restart-no-suitable-host.t → ...estart/39-auto-restart-no-suitable-host.t b/...estart/39-auto-restart-no-suitable-host.t → ...estart/39-auto-restart-no-suitable-host.t
diff --git a/...ests/restart/40-auto-restart-force-stop.t → ...onal/restart/40-auto-restart-force-stop.t b/...ests/restart/40-auto-restart-force-stop.t → ...onal/restart/40-auto-restart-force-stop.t
diff --git a/flakytests/restart/46-stop-clock-time.t → ...kyfunctional/restart/46-stop-clock-time.t b/flakytests/restart/46-stop-clock-time.t → ...kyfunctional/restart/46-stop-clock-time.t
diff --git a/flakytests/restart/47-no-auto-stop.t → ...flakyfunctional/restart/47-no-auto-stop.t b/flakytests/restart/47-no-auto-stop.t → ...flakyfunctional/restart/47-no-auto-stop.t
diff --git a/...ytests/restart/bin/ctb-select-task-states → ...tional/restart/bin/ctb-select-task-states b/...ytests/restart/bin/ctb-select-task-states → ...tional/restart/bin/ctb-select-task-states
diff --git a/flakytests/restart/lib → tests/flakyfunctional/restart/lib b/flakytests/restart/lib → tests/flakyfunctional/restart/lib
diff --git a/flakytests/restart/test_header → tests/flakyfunctional/restart/test_header b/flakytests/restart/test_header → tests/flakyfunctional/restart/test_header
diff --git a/flakytests/shutdown/02-no-dir.t → tests/flakyfunctional/shutdown/02-no-dir.t b/flakytests/shutdown/02-no-dir.t → tests/flakyfunctional/shutdown/02-no-dir.t
diff --git a/flakytests/shutdown/02-no-dir/suite.rc → ...akyfunctional/shutdown/02-no-dir/suite.rc b/flakytests/shutdown/02-no-dir/suite.rc → ...akyfunctional/shutdown/02-no-dir/suite.rc
diff --git a/flakytests/shutdown/test_header → tests/flakyfunctional/shutdown/test_header b/flakytests/shutdown/test_header → tests/flakyfunctional/shutdown/test_header
diff --git a/flakytests/special/04-clock-triggered.t → ...kyfunctional/special/04-clock-triggered.t b/flakytests/special/04-clock-triggered.t → ...kyfunctional/special/04-clock-triggered.t
diff --git a/...tests/special/04-clock-triggered/suite.rc → ...ional/special/04-clock-triggered/suite.rc b/...tests/special/04-clock-triggered/suite.rc → ...ional/special/04-clock-triggered/suite.rc
diff --git a/flakytests/special/05-clock-triggered-utc → ...functional/special/05-clock-triggered-utc b/flakytests/special/05-clock-triggered-utc → ...functional/special/05-clock-triggered-utc
diff --git a/flakytests/special/05-clock-triggered-utc.t → ...nctional/special/05-clock-triggered-utc.t b/flakytests/special/05-clock-triggered-utc.t → ...nctional/special/05-clock-triggered-utc.t
diff --git a/flakytests/special/06-clock-triggered-iso → ...functional/special/06-clock-triggered-iso b/flakytests/special/06-clock-triggered-iso → ...functional/special/06-clock-triggered-iso
diff --git a/flakytests/special/06-clock-triggered-iso.t → ...nctional/special/06-clock-triggered-iso.t b/flakytests/special/06-clock-triggered-iso.t → ...nctional/special/06-clock-triggered-iso.t
diff --git a/flakytests/special/08-clock-triggered-0 → ...kyfunctional/special/08-clock-triggered-0 b/flakytests/special/08-clock-triggered-0 → ...kyfunctional/special/08-clock-triggered-0
diff --git a/flakytests/special/08-clock-triggered-0.t → ...functional/special/08-clock-triggered-0.t b/flakytests/special/08-clock-triggered-0.t → ...functional/special/08-clock-triggered-0.t
diff --git a/flakytests/special/test_header → tests/flakyfunctional/special/test_header b/flakytests/special/test_header → tests/flakyfunctional/special/test_header
diff --git a/flakytests/xtriggers/00-wall_clock.t → ...flakyfunctional/xtriggers/00-wall_clock.t b/flakytests/xtriggers/00-wall_clock.t → ...flakyfunctional/xtriggers/00-wall_clock.t
diff --git a/flakytests/xtriggers/00-wall_clock/suite.rc → ...nctional/xtriggers/00-wall_clock/suite.rc b/flakytests/xtriggers/00-wall_clock/suite.rc → ...nctional/xtriggers/00-wall_clock/suite.rc
diff --git a/flakytests/xtriggers/01-suite_state.t → ...lakyfunctional/xtriggers/01-suite_state.t b/flakytests/xtriggers/01-suite_state.t → ...lakyfunctional/xtriggers/01-suite_state.t
diff --git a/flakytests/xtriggers/01-suite_state/suite.rc → ...ctional/xtriggers/01-suite_state/suite.rc b/flakytests/xtriggers/01-suite_state/suite.rc → ...ctional/xtriggers/01-suite_state/suite.rc
diff --git a/...triggers/01-suite_state/upstream/suite.rc → ...triggers/01-suite_state/upstream/suite.rc b/...triggers/01-suite_state/upstream/suite.rc → ...triggers/01-suite_state/upstream/suite.rc
diff --git a/flakytests/xtriggers/test_header → tests/flakyfunctional/xtriggers/test_header b/flakytests/xtriggers/test_header → tests/flakyfunctional/xtriggers/test_header
diff --git a/tests/README.md → tests/functional/README.md b/tests/README.md → tests/functional/README.md
@@ -5,11 +5,21 @@ This directory contains Cylc functional tests.
 ## How To Run These Tests
 
 ```console
-$ etc/bin/run-functional-tests tests/ flakytests/
-$ etc/bin/run-functional-tests tests/ flakytests/ -j 4  # 4 tests in parallel
+$ etc/bin/run-functional-tests tests/f tests/k
+$ etc/bin/run-functional-tests tests/f tests/k  # 4 tests in parallel
 ```
 
-## What Are Functional Tests
+## Why Are There Flaky Tests?
+
+A lot of the functional tests are highly timing dependent which can cause
+them to become flaky, especially on heavily loaded systems or slow
+file systems.
+
+We put especially sensitive functional tests into the `flakyfunctional`
+directory so that we can easily test them separately with fewer tests
+running in parallel to give them a chance of passing.
+
+## What Are Functional Tests?
 
 These tests ensure end-to-end functionality is as expected.
 

diff --git a/tests/api-suite-info/00-get-graph-raw-1.t → ...ional/api-suite-info/00-get-graph-raw-1.t b/tests/api-suite-info/00-get-graph-raw-1.t → ...ional/api-suite-info/00-get-graph-raw-1.t
diff --git a/.../00-get-graph-raw-1/bin/ctb-get-graph-raw → .../00-get-graph-raw-1/bin/ctb-get-graph-raw b/.../00-get-graph-raw-1/bin/ctb-get-graph-raw → .../00-get-graph-raw-1/bin/ctb-get-graph-raw
diff --git a/...ite-info/00-get-graph-raw-1/reference.log → ...ite-info/00-get-graph-raw-1/reference.log b/...ite-info/00-get-graph-raw-1/reference.log → ...ite-info/00-get-graph-raw-1/reference.log
diff --git a/...pi-suite-info/00-get-graph-raw-1/suite.rc → ...pi-suite-info/00-get-graph-raw-1/suite.rc b/...pi-suite-info/00-get-graph-raw-1/suite.rc → ...pi-suite-info/00-get-graph-raw-1/suite.rc
diff --git a/tests/api-suite-info/01-get-graph-raw-2.t → ...ional/api-suite-info/01-get-graph-raw-2.t b/tests/api-suite-info/01-get-graph-raw-2.t → ...ional/api-suite-info/01-get-graph-raw-2.t
diff --git a/.../01-get-graph-raw-2/bin/ctb-get-graph-raw → .../01-get-graph-raw-2/bin/ctb-get-graph-raw b/.../01-get-graph-raw-2/bin/ctb-get-graph-raw → .../01-get-graph-raw-2/bin/ctb-get-graph-raw
diff --git a/...ite-info/01-get-graph-raw-2/reference.log → ...ite-info/01-get-graph-raw-2/reference.log b/...ite-info/01-get-graph-raw-2/reference.log → ...ite-info/01-get-graph-raw-2/reference.log
diff --git a/...pi-suite-info/01-get-graph-raw-2/suite.rc → ...pi-suite-info/01-get-graph-raw-2/suite.rc b/...pi-suite-info/01-get-graph-raw-2/suite.rc → ...pi-suite-info/01-get-graph-raw-2/suite.rc
diff --git a/tests/api-suite-info/02-get-graph-raw-3.t → ...ional/api-suite-info/02-get-graph-raw-3.t b/tests/api-suite-info/02-get-graph-raw-3.t → ...ional/api-suite-info/02-get-graph-raw-3.t
diff --git a/.../02-get-graph-raw-3/bin/ctb-get-graph-raw → .../02-get-graph-raw-3/bin/ctb-get-graph-raw b/.../02-get-graph-raw-3/bin/ctb-get-graph-raw → .../02-get-graph-raw-3/bin/ctb-get-graph-raw
diff --git a/...ite-info/02-get-graph-raw-3/reference.log → ...ite-info/02-get-graph-raw-3/reference.log b/...ite-info/02-get-graph-raw-3/reference.log → ...ite-info/02-get-graph-raw-3/reference.log
diff --git a/...pi-suite-info/02-get-graph-raw-3/suite.rc → ...pi-suite-info/02-get-graph-raw-3/suite.rc b/...pi-suite-info/02-get-graph-raw-3/suite.rc → ...pi-suite-info/02-get-graph-raw-3/suite.rc
diff --git a/tests/api-suite-info/03-get-graph-raw-4.t → ...ional/api-suite-info/03-get-graph-raw-4.t b/tests/api-suite-info/03-get-graph-raw-4.t → ...ional/api-suite-info/03-get-graph-raw-4.t
diff --git a/.../03-get-graph-raw-4/bin/ctb-get-graph-raw → .../03-get-graph-raw-4/bin/ctb-get-graph-raw b/.../03-get-graph-raw-4/bin/ctb-get-graph-raw → .../03-get-graph-raw-4/bin/ctb-get-graph-raw
diff --git a/...ite-info/03-get-graph-raw-4/reference.log → ...ite-info/03-get-graph-raw-4/reference.log b/...ite-info/03-get-graph-raw-4/reference.log → ...ite-info/03-get-graph-raw-4/reference.log
diff --git a/...pi-suite-info/03-get-graph-raw-4/suite.rc → ...pi-suite-info/03-get-graph-raw-4/suite.rc b/...pi-suite-info/03-get-graph-raw-4/suite.rc → ...pi-suite-info/03-get-graph-raw-4/suite.rc
diff --git a/tests/api-suite-info/test_header → tests/functional/api-suite-info/test_header b/tests/api-suite-info/test_header → tests/functional/api-suite-info/test_header
diff --git a/tests/authentication/00-shared-fs.t → .../functional/authentication/00-shared-fs.t b/tests/authentication/00-shared-fs.t → .../functional/authentication/00-shared-fs.t
diff --git a/...authentication/00-shared-fs/reference.log → ...authentication/00-shared-fs/reference.log b/...authentication/00-shared-fs/reference.log → ...authentication/00-shared-fs/reference.log
diff --git a/tests/authentication/00-shared-fs/suite.rc → ...onal/authentication/00-shared-fs/suite.rc b/tests/authentication/00-shared-fs/suite.rc → ...onal/authentication/00-shared-fs/suite.rc
diff --git a/...uthentication/01-remote-suite-same-name.t → ...uthentication/01-remote-suite-same-name.t b/...uthentication/01-remote-suite-same-name.t → ...uthentication/01-remote-suite-same-name.t
diff --git a/...n/01-remote-suite-same-name/reference.log → ...n/01-remote-suite-same-name/reference.log b/...n/01-remote-suite-same-name/reference.log → ...n/01-remote-suite-same-name/reference.log
diff --git a/...cation/01-remote-suite-same-name/suite.rc → ...cation/01-remote-suite-same-name/suite.rc b/...cation/01-remote-suite-same-name/suite.rc → ...cation/01-remote-suite-same-name/suite.rc
diff --git a/tests/authentication/02-suite2-stop-suite1.t → ...al/authentication/02-suite2-stop-suite1.t b/tests/authentication/02-suite2-stop-suite1.t → ...al/authentication/02-suite2-stop-suite1.t
diff --git a/tests/authentication/basic/suite.rc → .../functional/authentication/basic/suite.rc b/tests/authentication/basic/suite.rc → .../functional/authentication/basic/suite.rc
diff --git a/tests/authentication/test_header → tests/functional/authentication/test_header b/tests/authentication/test_header → tests/functional/authentication/test_header
diff --git a/tests/broadcast/00-simple.t → tests/functional/broadcast/00-simple.t b/tests/broadcast/00-simple.t → tests/functional/broadcast/00-simple.t
diff --git a/tests/broadcast/00-simple/broadcast.ref → ...ctional/broadcast/00-simple/broadcast.ref b/tests/broadcast/00-simple/broadcast.ref → ...ctional/broadcast/00-simple/broadcast.ref
diff --git a/tests/broadcast/00-simple/expected-prep.err → ...nal/broadcast/00-simple/expected-prep.err b/tests/broadcast/00-simple/expected-prep.err → ...nal/broadcast/00-simple/expected-prep.err
diff --git a/tests/broadcast/00-simple/expected-prep.out → ...nal/broadcast/00-simple/expected-prep.out b/tests/broadcast/00-simple/expected-prep.out → ...nal/broadcast/00-simple/expected-prep.out
diff --git a/tests/broadcast/00-simple/reference.log → ...ctional/broadcast/00-simple/reference.log b/tests/broadcast/00-simple/reference.log → ...ctional/broadcast/00-simple/reference.log
diff --git a/tests/broadcast/00-simple/suite.rc → ...s/functional/broadcast/00-simple/suite.rc b/tests/broadcast/00-simple/suite.rc → ...s/functional/broadcast/00-simple/suite.rc
diff --git a/tests/broadcast/02-inherit.t → tests/functional/broadcast/02-inherit.t b/tests/broadcast/02-inherit.t → tests/functional/broadcast/02-inherit.t
diff --git a/tests/broadcast/02-inherit/reference.log → ...tional/broadcast/02-inherit/reference.log b/tests/broadcast/02-inherit/reference.log → ...tional/broadcast/02-inherit/reference.log
diff --git a/tests/broadcast/02-inherit/suite.rc → .../functional/broadcast/02-inherit/suite.rc b/tests/broadcast/02-inherit/suite.rc → .../functional/broadcast/02-inherit/suite.rc
diff --git a/tests/broadcast/03-expire.t → tests/functional/broadcast/03-expire.t b/tests/broadcast/03-expire.t → tests/functional/broadcast/03-expire.t
diff --git a/tests/broadcast/03-expire/reference.log → ...ctional/broadcast/03-expire/reference.log b/tests/broadcast/03-expire/reference.log → ...ctional/broadcast/03-expire/reference.log
diff --git a/tests/broadcast/03-expire/suite.rc → ...s/functional/broadcast/03-expire/suite.rc b/tests/broadcast/03-expire/suite.rc → ...s/functional/broadcast/03-expire/suite.rc
diff --git a/tests/broadcast/04-empty.t → tests/functional/broadcast/04-empty.t b/tests/broadcast/04-empty.t → tests/functional/broadcast/04-empty.t
diff --git a/tests/broadcast/04-empty/reference.log → ...nctional/broadcast/04-empty/reference.log b/tests/broadcast/04-empty/reference.log → ...nctional/broadcast/04-empty/reference.log
diff --git a/tests/broadcast/04-empty/suite.rc → tests/functional/broadcast/04-empty/suite.rc b/tests/broadcast/04-empty/suite.rc → tests/functional/broadcast/04-empty/suite.rc
diff --git a/tests/broadcast/05-bad-point.t → tests/functional/broadcast/05-bad-point.t b/tests/broadcast/05-bad-point.t → tests/functional/broadcast/05-bad-point.t
diff --git a/tests/broadcast/05-bad-point/suite.rc → ...unctional/broadcast/05-bad-point/suite.rc b/tests/broadcast/05-bad-point/suite.rc → ...unctional/broadcast/05-bad-point/suite.rc
diff --git a/tests/broadcast/06-bad-namespace.t → ...s/functional/broadcast/06-bad-namespace.t b/tests/broadcast/06-bad-namespace.t → ...s/functional/broadcast/06-bad-namespace.t
diff --git a/tests/broadcast/06-bad-namespace/suite.rc → ...ional/broadcast/06-bad-namespace/suite.rc b/tests/broadcast/06-bad-namespace/suite.rc → ...ional/broadcast/06-bad-namespace/suite.rc
diff --git a/tests/broadcast/07-timeout.t → tests/functional/broadcast/07-timeout.t b/tests/broadcast/07-timeout.t → tests/functional/broadcast/07-timeout.t
diff --git a/tests/broadcast/07-timeout/reference.log → ...tional/broadcast/07-timeout/reference.log b/tests/broadcast/07-timeout/reference.log → ...tional/broadcast/07-timeout/reference.log
diff --git a/tests/broadcast/07-timeout/suite.rc → .../functional/broadcast/07-timeout/suite.rc b/tests/broadcast/07-timeout/suite.rc → .../functional/broadcast/07-timeout/suite.rc
diff --git a/tests/broadcast/08-space.t → tests/functional/broadcast/08-space.t b/tests/broadcast/08-space.t → tests/functional/broadcast/08-space.t
diff --git a/tests/broadcast/08-space/reference.log → ...nctional/broadcast/08-space/reference.log b/tests/broadcast/08-space/reference.log → ...nctional/broadcast/08-space/reference.log
diff --git a/tests/broadcast/08-space/suite.rc → tests/functional/broadcast/08-space/suite.rc b/tests/broadcast/08-space/suite.rc → tests/functional/broadcast/08-space/suite.rc
diff --git a/tests/broadcast/09-remote.t → tests/functional/broadcast/09-remote.t b/tests/broadcast/09-remote.t → tests/functional/broadcast/09-remote.t
diff --git a/tests/broadcast/09-remote/reference.log → ...ctional/broadcast/09-remote/reference.log b/tests/broadcast/09-remote/reference.log → ...ctional/broadcast/09-remote/reference.log
diff --git a/tests/broadcast/09-remote/suite.rc → ...s/functional/broadcast/09-remote/suite.rc b/tests/broadcast/09-remote/suite.rc → ...s/functional/broadcast/09-remote/suite.rc
diff --git a/tests/broadcast/10-file-1.t → tests/functional/broadcast/10-file-1.t b/tests/broadcast/10-file-1.t → tests/functional/broadcast/10-file-1.t
diff --git a/tests/broadcast/10-file-1/broadcast.rc → ...nctional/broadcast/10-file-1/broadcast.rc b/tests/broadcast/10-file-1/broadcast.rc → ...nctional/broadcast/10-file-1/broadcast.rc
diff --git a/tests/broadcast/10-file-1/reference.log → ...ctional/broadcast/10-file-1/reference.log b/tests/broadcast/10-file-1/reference.log → ...ctional/broadcast/10-file-1/reference.log
diff --git a/tests/broadcast/10-file-1/suite.rc → ...s/functional/broadcast/10-file-1/suite.rc b/tests/broadcast/10-file-1/suite.rc → ...s/functional/broadcast/10-file-1/suite.rc
diff --git a/tests/broadcast/11-file-2.t → tests/functional/broadcast/11-file-2.t b/tests/broadcast/11-file-2.t → tests/functional/broadcast/11-file-2.t
diff --git a/tests/broadcast/11-file-2/broadcast-1.rc → ...tional/broadcast/11-file-2/broadcast-1.rc b/tests/broadcast/11-file-2/broadcast-1.rc → ...tional/broadcast/11-file-2/broadcast-1.rc
diff --git a/tests/broadcast/11-file-2/broadcast-2.rc → ...tional/broadcast/11-file-2/broadcast-2.rc b/tests/broadcast/11-file-2/broadcast-2.rc → ...tional/broadcast/11-file-2/broadcast-2.rc
diff --git a/tests/broadcast/11-file-2/reference.log → ...ctional/broadcast/11-file-2/reference.log b/tests/broadcast/11-file-2/reference.log → ...ctional/broadcast/11-file-2/reference.log
diff --git a/tests/broadcast/11-file-2/suite.rc → ...s/functional/broadcast/11-file-2/suite.rc b/tests/broadcast/11-file-2/suite.rc → ...s/functional/broadcast/11-file-2/suite.rc
diff --git a/tests/broadcast/12-file-stdin.t → tests/functional/broadcast/12-file-stdin.t b/tests/broadcast/12-file-stdin.t → tests/functional/broadcast/12-file-stdin.t
diff --git a/tests/broadcast/12-file-stdin/broadcast.rc → ...onal/broadcast/12-file-stdin/broadcast.rc b/tests/broadcast/12-file-stdin/broadcast.rc → ...onal/broadcast/12-file-stdin/broadcast.rc
diff --git a/tests/broadcast/12-file-stdin/reference.log → ...nal/broadcast/12-file-stdin/reference.log b/tests/broadcast/12-file-stdin/reference.log → ...nal/broadcast/12-file-stdin/reference.log
diff --git a/tests/broadcast/12-file-stdin/suite.rc → ...nctional/broadcast/12-file-stdin/suite.rc b/tests/broadcast/12-file-stdin/suite.rc → ...nctional/broadcast/12-file-stdin/suite.rc
diff --git a/tests/broadcast/13-file-cancel.t → tests/functional/broadcast/13-file-cancel.t b/tests/broadcast/13-file-cancel.t → tests/functional/broadcast/13-file-cancel.t
diff --git a/...s/broadcast/13-file-cancel/broadcast-1.rc → ...l/broadcast/13-file-cancel/broadcast-1.rc b/...s/broadcast/13-file-cancel/broadcast-1.rc → ...l/broadcast/13-file-cancel/broadcast-1.rc
diff --git a/...s/broadcast/13-file-cancel/broadcast-2.rc → ...l/broadcast/13-file-cancel/broadcast-2.rc b/...s/broadcast/13-file-cancel/broadcast-2.rc → ...l/broadcast/13-file-cancel/broadcast-2.rc
diff --git a/tests/broadcast/13-file-cancel/reference.log → ...al/broadcast/13-file-cancel/reference.log b/tests/broadcast/13-file-cancel/reference.log → ...al/broadcast/13-file-cancel/reference.log
diff --git a/tests/broadcast/13-file-cancel/suite.rc → ...ctional/broadcast/13-file-cancel/suite.rc b/tests/broadcast/13-file-cancel/suite.rc → ...ctional/broadcast/13-file-cancel/suite.rc
diff --git a/tests/broadcast/test_header → tests/functional/broadcast/test_header b/tests/broadcast/test_header → tests/functional/broadcast/test_header
diff --git a/tests/cli/00-cycle-points.t → tests/functional/cli/00-cycle-points.t b/tests/cli/00-cycle-points.t → tests/functional/cli/00-cycle-points.t
diff --git a/tests/cli/00-cycle-points/suite.rc → ...s/functional/cli/00-cycle-points/suite.rc b/tests/cli/00-cycle-points/suite.rc → ...s/functional/cli/00-cycle-points/suite.rc
diff --git a/tests/cli/01-help.t → tests/functional/cli/01-help.t b/tests/cli/01-help.t → tests/functional/cli/01-help.t
diff --git a/tests/cli/02-now.t → tests/functional/cli/02-now.t b/tests/cli/02-now.t → tests/functional/cli/02-now.t
diff --git a/tests/cli/03-set-verbosity.t → tests/functional/cli/03-set-verbosity.t b/tests/cli/03-set-verbosity.t → tests/functional/cli/03-set-verbosity.t
diff --git a/tests/cli/test_header → tests/functional/cli/test_header b/tests/cli/test_header → tests/functional/cli/test_header
diff --git a/tests/clock-expire/00-basic.t → tests/functional/clock-expire/00-basic.t b/tests/clock-expire/00-basic.t → tests/functional/clock-expire/00-basic.t
diff --git a/tests/clock-expire/00-basic/suite.rc → ...functional/clock-expire/00-basic/suite.rc b/tests/clock-expire/00-basic/suite.rc → ...functional/clock-expire/00-basic/suite.rc
diff --git a/tests/clock-expire/test_header → tests/functional/clock-expire/test_header b/tests/clock-expire/test_header → tests/functional/clock-expire/test_header
diff --git a/tests/cyclepoint/00-time.t → tests/functional/cyclepoint/00-time.t b/tests/cyclepoint/00-time.t → tests/functional/cyclepoint/00-time.t
diff --git a/tests/cyclepoint/02-template.t → tests/functional/cyclepoint/02-template.t b/tests/cyclepoint/02-template.t → tests/functional/cyclepoint/02-template.t
diff --git a/tests/cyclepoint/test_header → tests/functional/cyclepoint/test_header b/tests/cyclepoint/test_header → tests/functional/cyclepoint/test_header
diff --git a/tests/cyclers/00-daily-find.out → tests/functional/cyclers/00-daily-find.out b/tests/cyclers/00-daily-find.out → tests/functional/cyclers/00-daily-find.out
diff --git a/tests/cyclers/00-daily.t → tests/functional/cyclers/00-daily.t b/tests/cyclers/00-daily.t → tests/functional/cyclers/00-daily.t
diff --git a/tests/cyclers/0000_rollunder/suite.rc → ...unctional/cyclers/0000_rollunder/suite.rc b/tests/cyclers/0000_rollunder/suite.rc → ...unctional/cyclers/0000_rollunder/suite.rc
diff --git a/tests/cyclers/01-hourly.t → tests/functional/cyclers/01-hourly.t b/tests/cyclers/01-hourly.t → tests/functional/cyclers/01-hourly.t
diff --git a/tests/cyclers/02-monthly.t → tests/functional/cyclers/02-monthly.t b/tests/cyclers/02-monthly.t → tests/functional/cyclers/02-monthly.t
diff --git a/tests/cyclers/03-multidaily.t → tests/functional/cyclers/03-multidaily.t b/tests/cyclers/03-multidaily.t → tests/functional/cyclers/03-multidaily.t
diff --git a/tests/cyclers/04-multihourly.t → tests/functional/cyclers/04-multihourly.t b/tests/cyclers/04-multihourly.t → tests/functional/cyclers/04-multihourly.t
diff --git a/tests/cyclers/05-multimonthly.t → tests/functional/cyclers/05-multimonthly.t b/tests/cyclers/05-multimonthly.t → tests/functional/cyclers/05-multimonthly.t
diff --git a/tests/cyclers/06-multiweekly.t → tests/functional/cyclers/06-multiweekly.t b/tests/cyclers/06-multiweekly.t → tests/functional/cyclers/06-multiweekly.t
diff --git a/tests/cyclers/07-multiyearly.t → tests/functional/cyclers/07-multiyearly.t b/tests/cyclers/07-multiyearly.t → tests/functional/cyclers/07-multiyearly.t
diff --git a/tests/cyclers/08-offset_final.t → tests/functional/cyclers/08-offset_final.t b/tests/cyclers/08-offset_final.t → tests/functional/cyclers/08-offset_final.t
diff --git a/tests/cyclers/09-offset_initial.t → tests/functional/cyclers/09-offset_initial.t b/tests/cyclers/09-offset_initial.t → tests/functional/cyclers/09-offset_initial.t
diff --git a/tests/cyclers/10-r1_final.t → tests/functional/cyclers/10-r1_final.t b/tests/cyclers/10-r1_final.t → tests/functional/cyclers/10-r1_final.t
diff --git a/tests/cyclers/11-r1_initial.t → tests/functional/cyclers/11-r1_initial.t b/tests/cyclers/11-r1_initial.t → tests/functional/cyclers/11-r1_initial.t
diff --git a/tests/cyclers/12-r1_middle.t → tests/functional/cyclers/12-r1_middle.t b/tests/cyclers/12-r1_middle.t → tests/functional/cyclers/12-r1_middle.t
diff --git a/tests/cyclers/13-r5_final.t → tests/functional/cyclers/13-r5_final.t b/tests/cyclers/13-r5_final.t → tests/functional/cyclers/13-r5_final.t
diff --git a/tests/cyclers/14-r5_initial.t → tests/functional/cyclers/14-r5_initial.t b/tests/cyclers/14-r5_initial.t → tests/functional/cyclers/14-r5_initial.t
diff --git a/tests/cyclers/15-subhourly.t → tests/functional/cyclers/15-subhourly.t b/tests/cyclers/15-subhourly.t → tests/functional/cyclers/15-subhourly.t
diff --git a/tests/cyclers/16-weekly.t → tests/functional/cyclers/16-weekly.t b/tests/cyclers/16-weekly.t → tests/functional/cyclers/16-weekly.t
diff --git a/tests/cyclers/17-yearly.t → tests/functional/cyclers/17-yearly.t b/tests/cyclers/17-yearly.t → tests/functional/cyclers/17-yearly.t
diff --git a/tests/cyclers/18-r1_multi_start.t → tests/functional/cyclers/18-r1_multi_start.t b/tests/cyclers/18-r1_multi_start.t → tests/functional/cyclers/18-r1_multi_start.t
diff --git a/tests/cyclers/20-multidaily_local.t → .../functional/cyclers/20-multidaily_local.t b/tests/cyclers/20-multidaily_local.t → .../functional/cyclers/20-multidaily_local.t
diff --git a/tests/cyclers/21-360_calendar.t → tests/functional/cyclers/21-360_calendar.t b/tests/cyclers/21-360_calendar.t → tests/functional/cyclers/21-360_calendar.t
diff --git a/...s/cyclers/21-360_calendar/graph.plain.ref → ...l/cyclers/21-360_calendar/graph.plain.ref b/...s/cyclers/21-360_calendar/graph.plain.ref → ...l/cyclers/21-360_calendar/graph.plain.ref
diff --git a/tests/cyclers/21-360_calendar/reference.log → ...nal/cyclers/21-360_calendar/reference.log b/tests/cyclers/21-360_calendar/reference.log → ...nal/cyclers/21-360_calendar/reference.log
diff --git a/tests/cyclers/21-360_calendar/suite.rc → ...nctional/cyclers/21-360_calendar/suite.rc b/tests/cyclers/21-360_calendar/suite.rc → ...nctional/cyclers/21-360_calendar/suite.rc
diff --git a/tests/cyclers/25-aeon.t → tests/functional/cyclers/25-aeon.t b/tests/cyclers/25-aeon.t → tests/functional/cyclers/25-aeon.t
diff --git a/tests/cyclers/26-0000_rollunder.t → tests/functional/cyclers/26-0000_rollunder.t b/tests/cyclers/26-0000_rollunder.t → tests/functional/cyclers/26-0000_rollunder.t
diff --git a/tests/cyclers/27-9999_rollover.t → tests/functional/cyclers/27-9999_rollover.t b/tests/cyclers/27-9999_rollover.t → tests/functional/cyclers/27-9999_rollover.t
diff --git a/tests/cyclers/28-implicit-disallowed.t → ...nctional/cyclers/28-implicit-disallowed.t b/tests/cyclers/28-implicit-disallowed.t → ...nctional/cyclers/28-implicit-disallowed.t
diff --git a/...s/cyclers/28-implicit-disallowed/suite.rc → ...l/cyclers/28-implicit-disallowed/suite.rc b/...s/cyclers/28-implicit-disallowed/suite.rc → ...l/cyclers/28-implicit-disallowed/suite.rc
diff --git a/tests/cyclers/29-r1_restricted.t → tests/functional/cyclers/29-r1_restricted.t b/tests/cyclers/29-r1_restricted.t → tests/functional/cyclers/29-r1_restricted.t
diff --git a/tests/cyclers/31-rnone_reverse.t → tests/functional/cyclers/31-rnone_reverse.t b/tests/cyclers/31-rnone_reverse.t → tests/functional/cyclers/31-rnone_reverse.t
diff --git a/tests/cyclers/32-rmany_reverse.t → tests/functional/cyclers/32-rmany_reverse.t b/tests/cyclers/32-rmany_reverse.t → tests/functional/cyclers/32-rmany_reverse.t
diff --git a/tests/cyclers/33-integer1.t → tests/functional/cyclers/33-integer1.t b/tests/cyclers/33-integer1.t → tests/functional/cyclers/33-integer1.t
diff --git a/tests/cyclers/34-r1_initial_immortal.t → ...nctional/cyclers/34-r1_initial_immortal.t b/tests/cyclers/34-r1_initial_immortal.t → ...nctional/cyclers/34-r1_initial_immortal.t
diff --git a/tests/cyclers/35-day_of_week.t → tests/functional/cyclers/35-day_of_week.t b/tests/cyclers/35-day_of_week.t → tests/functional/cyclers/35-day_of_week.t
diff --git a/tests/cyclers/36-icp_fcp_notation.t → .../functional/cyclers/36-icp_fcp_notation.t b/tests/cyclers/36-icp_fcp_notation.t → .../functional/cyclers/36-icp_fcp_notation.t
diff --git a/...cyclers/36-icp_fcp_notation/reference.log → ...cyclers/36-icp_fcp_notation/reference.log b/...cyclers/36-icp_fcp_notation/reference.log → ...cyclers/36-icp_fcp_notation/reference.log
diff --git a/tests/cyclers/36-icp_fcp_notation/suite.rc → ...onal/cyclers/36-icp_fcp_notation/suite.rc b/tests/cyclers/36-icp_fcp_notation/suite.rc → ...onal/cyclers/36-icp_fcp_notation/suite.rc
diff --git a/tests/cyclers/37-exclusions.t → tests/functional/cyclers/37-exclusions.t b/tests/cyclers/37-exclusions.t → tests/functional/cyclers/37-exclusions.t
diff --git a/tests/cyclers/39-exclusions_advanced.t → ...nctional/cyclers/39-exclusions_advanced.t b/tests/cyclers/39-exclusions_advanced.t → ...nctional/cyclers/39-exclusions_advanced.t
diff --git a/.../cyclers/40-integer_exclusions_advanced.t → .../cyclers/40-integer_exclusions_advanced.t b/.../cyclers/40-integer_exclusions_advanced.t → .../cyclers/40-integer_exclusions_advanced.t
diff --git a/tests/cyclers/47-icp_fcp_notation.t → .../functional/cyclers/47-icp_fcp_notation.t b/tests/cyclers/47-icp_fcp_notation.t → .../functional/cyclers/47-icp_fcp_notation.t
diff --git a/tests/cyclers/47-icp_fcp_notation/suite.rc → ...onal/cyclers/47-icp_fcp_notation/suite.rc b/tests/cyclers/47-icp_fcp_notation/suite.rc → ...onal/cyclers/47-icp_fcp_notation/suite.rc
diff --git a/tests/cyclers/48-icp-cutoff.t → tests/functional/cyclers/48-icp-cutoff.t b/tests/cyclers/48-icp-cutoff.t → tests/functional/cyclers/48-icp-cutoff.t