Merge pull request #4305 from chu11/longtest_cleanup

teststuite: document and fixup LONGTEST tests

Author: mergify[bot]

t/README.md

@@ -100,6 +100,9 @@ All tests support a standard set of options:
 
 ```
 
+Normally long running tests are not executed.  The environment
+variable `TEST_LONG` may be set to have all long running tests run.
+
 The environment variable `FLUX_TEST_INSTALLED_PATH` may also be set
 to the path to an *installed* version of the `flux(1)` command, for
 running the testsuite against an installed version of flux-core.

t/job-list/list-id.py

@@ -26,11 +26,11 @@
 jobspec = job.JobspecV1.from_command(["sleep", "0"], num_tasks=1, cores_per_task=1)
 
 
-def list_cb(f, arg):
+def list_cb(f):
     print(f.get())
 
 
-def submit_cb(f, arg):
+def submit_cb(f):
     jobid = job.submit_get_id(f)
     h.rpc("job-list.list-id", dict(id=jobid, attrs=attrs)).then(list_cb)
 

t/t0000-sharness.t

@@ -378,15 +378,19 @@ test_expect_success COLOR,PERL_AND_TTY 'sub-sharness still has color' "
 	EOF
 "
 
-test_expect_success 'EXPENSIVE prereq not activated by default' "
+# Following test should only run by default when TEST_LONG isn't set
+if test -z "$TEST_LONG";  then
+    test_set_prereq NO_TEST_LONG
+fi
+test_expect_success NO_TEST_LONG 'EXPENSIVE prereq not activated by default' "
 	run_sub_test_lib_test no-long 'long test' <<-\\EOF &&
 	test_expect_success 'passing test' 'true'
-	test_expect_success EXPENSIVE 'passing suposedly long test' 'true'
+	test_expect_success EXPENSIVE 'passing supposedly long test' 'true'
 	test_done
 	EOF
 	check_sub_test_lib_test no-long <<-\\EOF
 	> ok 1 - passing test
-	> ok 2 # skip passing suposedly long test (missing EXPENSIVE)
+	> ok 2 # skip passing supposedly long test (missing EXPENSIVE)
 	> # passed all 2 test(s)
 	> 1..2
 	EOF
@@ -395,12 +399,12 @@ test_expect_success 'EXPENSIVE prereq not activated by default' "
 test_expect_success 'EXPENSIVE prereq is activated by --long' "
 	run_sub_test_lib_test long 'long test' '' '--long' <<-\\EOF &&
 	test_expect_success 'passing test' 'true'
-	test_expect_success EXPENSIVE 'passing suposedly long test' 'true'
+	test_expect_success EXPENSIVE 'passing supposedly long test' 'true'
 	test_done
 	EOF
 	check_sub_test_lib_test long <<-\\EOF
 	> ok 1 - passing test
-	> ok 2 - passing suposedly long test
+	> ok 2 - passing supposedly long test
 	> # passed all 2 test(s)
 	> 1..2
 	EOF

t/t0018-content-files.t

@@ -4,10 +4,6 @@ test_description='Test content-files backing store service'
 
 . `dirname $0`/sharness.sh
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 test_under_flux 1 minimal -o,-Sstatedir=$(pwd)
 
 BLOBREF=${FLUX_BUILD_DIR}/t/kvs/blobref

t/t0024-content-s3.t

@@ -9,10 +9,6 @@ if test -z "$S3_HOSTNAME"; then
 	test_done
 fi
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 export FLUX_CONF_DIR=$(pwd)
 
 test_under_flux 1 minimal

t/t1005-kvs-security.t

@@ -9,10 +9,6 @@ These are tests for ensuring multiple namespaces work.
 
 . `dirname $0`/sharness.sh
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 # Size the session to one more than the number of cores, minimum of 4
 SIZE=$(test_size_large)
 test_under_flux ${SIZE} kvs

t/t1009-kvs-copy.t

@@ -9,10 +9,6 @@ Test flux-kvs copy and flux-kvs move.
 
 . `dirname $0`/sharness.sh
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 SIZE=1
 test_under_flux ${SIZE} kvs
 

t/t2100-job-ingest.t

@@ -4,9 +4,6 @@ test_description='Test flux job ingest service'
 
 . $(dirname $0)/sharness.sh
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
 if ${FLUX_BUILD_DIR}/t/ingest/submitbench --help 2>&1 | grep -q sign-type; then
     test_set_prereq HAVE_FLUX_SECURITY
     SUBMITBENCH_OPT_R="--reuse-signature"

t/t2260-job-list.t

@@ -11,10 +11,6 @@ listRPC="flux python ${SHARNESS_TEST_SRCDIR}/job-list/list-rpc.py"
 PERMISSIVE_SCHEMA=${FLUX_SOURCE_DIR}/t/job-list/jobspec-permissive.jsonschema
 JOB_CONV="flux python ${FLUX_SOURCE_DIR}/t/job-manager/job-conv.py"
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 fj_wait_event() {
   flux job wait-event --timeout=20 "$@"
 }

t/t2261-job-list-update.t

@@ -8,10 +8,6 @@ test_under_flux 4 job
 
 RPC=${FLUX_BUILD_DIR}/t/request/rpc
 
-if test "$TEST_LONG" = "t"; then
-    test_set_prereq LONGTEST
-fi
-
 fj_wait_event() {
   flux job wait-event --timeout=20 "$@"
 }