MESS WITH TESTS

cylc · Feb 14, 2022 · ed7d780 · ed7d780
1 parent 8ad90bd
commit ed7d780
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
@@ -34,37 +34,16 @@ jobs:
       matrix:
         os: ['ubuntu-latest']
         python-version: ['3.7']
-        test-base: ['tests/f']
-        chunk: ['1/4', '2/4', '3/4', '4/4']
-        platform: ['_local_background* _local_at*']
+        test-base: ['tests/f/spawn-on-demand']
+        chunk: ['1/1']
+        platform: ['_local_background*']
         # NOTE: includes must define ALL of the matrix values
         include:
-          # tests/k
-          - name: 'flaky'
+          - name: 'junk'
             os: 'ubuntu-latest'
             python-version: '3.7'
-            test-base: 'tests/k'
+            test-base: 'tests/f/spawn-on-demand'
             chunk: '1/1'
-            platform: '_local_background* _local_at*'
-          # remote platforms
-          - name: '_remote_background_indep_poll'
-            os: 'ubuntu-latest'
-            python-version: '3.7'
-            test-base: 'tests/f tests/k'
-            chunk: '1/1'
-            platform: '_remote_background_indep_poll _remote_at_indep_poll'
-          - name: '_remote_background_indep_tcp'
-            os: 'ubuntu-latest'
-            test-base: 'tests/f tests/k'
-            python-version: '3.7'
-            chunk: '1/1'
-            platform: '_remote_background_indep_tcp _remote_at_indep_tcp'
-          # macos
-          - name: 'macos'
-            os: 'macos-latest'
-            python-version: '3.7'
-            test-base: 'tests/f'
-            chunk: '1/4'
             platform: '_local_background*'
 
     env:

diff --git a/tests/functional/lib/bash/test_header b/tests/functional/lib/bash/test_header
@@ -803,6 +803,14 @@ reftest() {
     purge
 }
 
+reftest_nopurge() {
+    # Install, validate, run, and purge, a reference test.
+    # Expect 2 OK tests.
+    install_and_validate "$@"
+    reftest_run "$@"
+}
+
+
 _get_test_config_file() {
     # print the path to the most specific global-tests.cylc on the system
     # (or print nothing if no test configs are present)

diff --git a/tests/functional/spawn-on-demand/14-trigger-flow-blocker.t b/tests/functional/spawn-on-demand/14-trigger-flow-blocker.t
@@ -21,5 +21,6 @@
 
 . "$(dirname "$0")/test_header"
 set_test_number 2
-reftest
+reftest_nopurge
+false
 exit