adapt tools/test.py

Forwarded: not-needed
Reviewed-By: Xavier Guimard <yadd@debian.org>
Last-Update: 2025-02-12

* log to stdout
* increase timeout multipliers
* rename --flaky-tests to --flaky-tests-mode and use --flaky-tests like --skip-tests

Gbp-Pq: Topic build
Gbp-Pq: Name test_ci.patch

diff --git a/Makefile b/Makefile
index 064a89b9466ac2ed02ac2f08316cb80dd637dca5..ff918ec061dbd691f8f8d648647fc79b39c0427f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -547,15 +547,15 @@ endif
 test-ci-native: LOGLEVEL := info
 test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
        $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
-               --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
+               --mode=$(BUILDTYPE_LOWER) --flaky-tests-mode=$(FLAKY_TESTS) \
                $(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
 
 .PHONY: test-ci-js
 # This target should not use a native compiler at all
 # Related CI job: node-test-commit-arm-fanned
 test-ci-js: | clear-stalled
-       $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
-               --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
+       $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap \
+               --mode=$(BUILDTYPE_LOWER) --flaky-tests-mode=$(FLAKY_TESTS) \
                --skip-tests=$(CI_SKIP_TESTS) \
                $(TEST_CI_ARGS) $(CI_JS_SUITES)
        $(info Clean up any leftover processes, error if found.)
@@ -571,7 +571,7 @@ test-ci: LOGLEVEL := info
 test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests doc-only
        out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
        $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
-               --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
+               --mode=$(BUILDTYPE_LOWER) --flaky-tests-mode=$(FLAKY_TESTS) \
                $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
        $(NODE) ./test/embedding/test-embedding.js
        $(info Clean up any leftover processes, error if found.)

diff --git a/test/common/index.js b/test/common/index.js
index 9733f8746baa0eb5164384e42c18fe0b5cbd230a..6711d14b6a031e5e5f7d95b430ad588624bcaec2 100644 (file)
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -278,16 +278,15 @@ const pwdCommand = isWindows ?
 
 function platformTimeout(ms) {
   const multipliers = typeof ms === 'bigint' ?
-    { two: 2n, four: 4n, seven: 7n } : { two: 2, four: 4, seven: 7 };
+    { fast: 2n, slow: 4n } : { fast: 3, slow: 5 };
+ 
+  if (process.arch.startsWith('arm') || process.arch.startsWith('mips') || process.arch.startsWith('riscv'))
+    ms = multipliers.slow * ms;
+  else
+    ms = multipliers.fast * ms;
 
   if (process.features.debug)
-    ms = multipliers.two * ms;
-
-  if (exports.isAIX || exports.isIBMi)
-    return multipliers.two * ms; // Default localhost speed is slower on AIX
-
-  if (isPi)
-    return multipliers.two * ms;  // Raspberry Pi devices
+    ms = multipliers.slow * ms;
 
   return ms;
 }

diff --git a/tools/test.py b/tools/test.py
index 9d7838d7c0110a08d14c9b9e4d5d7e2690f97e9b..6e9416e8a357f8f5a7548665439e629a942fb21a 100755 (executable)
--- a/tools/test.py
+++ b/tools/test.py
@@ -1404,7 +1404,7 @@ def BuildOptions():
       default=False, action="store_true")
   result.add_option("--cat", help="Print the source of the tests",
       default=False, action="store_true")
-  result.add_option("--flaky-tests",
+  result.add_option("--flaky-tests-mode",
       help="Regard tests marked as flaky (run|skip|dontcare|keep_retrying)",
       default="run")
   result.add_option("--measure-flakiness",
@@ -1413,6 +1413,9 @@ def BuildOptions():
   result.add_option("--skip-tests",
       help="Tests that should not be executed (comma-separated)",
       default="")
+  result.add_option("--flaky-tests",
+      help="Tests that are flaky (comma-separated)",
+      default="")
   result.add_option("--warn-unused", help="Report unused rules",
       default=False, action="store_true")
   result.add_option("-j", help="The number of parallel tasks to run, 0=use number of cores",
@@ -1459,6 +1462,7 @@ def ProcessOptions(options):
   options.run = options.run.split(',')
   # Split at commas and filter out all the empty strings.
   options.skip_tests = [test for test in options.skip_tests.split(',') if test]
+  options.flaky_tests = [test for test in options.flaky_tests.split(',') if test]
   if options.run == [""]:
     options.run = None
   elif len(options.run) != 2:
@@ -1486,8 +1490,8 @@ def ProcessOptions(options):
     # -j and ignoring -J, which is the opposite of what we used to do before -J
     # became a legacy no-op.
     print('Warning: Legacy -J option is ignored. Using the -j option.')
-  if options.flaky_tests not in [RUN, SKIP, DONTCARE, KEEP_RETRYING]:
-    print("Unknown flaky-tests mode %s" % options.flaky_tests)
+  if options.flaky_tests_mode not in [RUN, SKIP, DONTCARE, KEEP_RETRYING]:
+    print("Unknown tests mode %s" % options.flaky_tests_mode)
     return False
   return True
 
@@ -1761,11 +1765,13 @@ def Main():
         sys.exit(1)
 
   def should_keep(case):
+    if any((s in case.file) for s in options.flaky_tests):
+      case.outcomes.add(FLAKY)
     if any((s in case.file) for s in options.skip_tests):
       return False
     elif SKIP in case.outcomes:
       return False
-    elif (options.flaky_tests == SKIP) and (set([SLOW, FLAKY]) & case.outcomes):
+    elif (options.flaky_tests_mode == SKIP) and (set([SLOW, FLAKY]) & case.outcomes):
       return False
     else:
       return True
@@ -1798,7 +1804,7 @@ def Main():
   else:
     try:
       start = time.time()
-      result = RunTestCases(cases_to_run, options.progress, options.j, options.flaky_tests, options.measure_flakiness)
+      result = RunTestCases(cases_to_run, options.progress, options.j, options.flaky_tests_mode, options.measure_flakiness)
       exitcode = 0 if result['allPassed'] else 1
       duration = time.time() - start
     except KeyboardInterrupt: