Merge pull request #6894 from cylc/8.5.x-sync

🤖 Merge 8.5.x-sync into master

Author: MetRonnie

cylc/flow/cfgspec/globalcfg.py

@@ -1297,8 +1297,8 @@ def default_for(
                     be created in ``<this-path>/cylc-run/<workflow-id>``
                     and a symbolic link will be created from
                     ``$HOME/cylc-run/<workflow-id>``.
-                    If not specified the workflow run directory will be created
-                    in ``$HOME/cylc-run/<workflow-id>``.
+                    If not specified, the workflow run directory will be
+                    created in ``$HOME/cylc-run/<workflow-id>``.
                     All the workflow files and the ``.service`` directory get
                     installed into this directory.
 
@@ -1308,13 +1308,12 @@ def default_for(
                     Conf(folder, VDR.V_STRING, None, desc=f"""
                         Alternative location for the {folder} dir.
 
-                        If specified the workflow {folder} directory will
+                        If specified, the workflow {folder} directory will
                         be created in
                         ``<this-path>/cylc-run/<workflow-id>/{folder}``
                         and a symbolic link will be created from
                         ``$HOME/cylc-run/<workflow-id>/{folder}``.
-                        If not specified the workflow log directory will
-                        be created in
+                        If not specified, the directory will be created in
                         ``$HOME/cylc-run/<workflow-id>/{folder}``.
 
                         .. versionadded:: {versionadded}

tests/functional/platforms/02-host-to-platform-upgrade.t

@@ -21,13 +21,15 @@
 #   - Task with a host setting that should match the test platform
 export REQUIRE_PLATFORM='loc:remote'
 . "$(dirname "$0")/test_header"
-set_test_number 6
+set_test_number 7
 
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
 # Ensure that a mix of syntax will fail.
 run_fail "${TEST_NAME_BASE}-validate-fail" \
-    cylc validate "flow2.cylc"
+    cylc validate "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/bad"
+# and fail in this specific manner:
+grep_ok "cannot be used with" "${TEST_NAME_BASE}-validate-fail.stderr"
 
 # Ensure that you can validate workflow
 run_ok "${TEST_NAME_BASE}-run" \