forked from pool/nodejs21
99 lines
4.1 KiB
Diff
99 lines
4.1 KiB
Diff
|
Author: Adam Majer <amajer@suse.de>
|
||
|
|
Date: Dec 20 09:18:49 UTC 2017
|
||
|
|
Summary: Fix CI unit tests framework for OBS building
|
||
|
|
|
||
|
|
Index: node-v20.8.1/test/parallel/test-module-loading-globalpaths.js
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/test/parallel/test-module-loading-globalpaths.js
|
||
|
|
+++ node-v20.8.1/test/parallel/test-module-loading-globalpaths.js
|
||
|
|
@@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c
|
||
|
|
|
||
|
|
addLibraryPath(process.env);
|
||
|
|
|
||
|
|
+common.skip('hardcoded global paths');
|
||
|
|
+return;
|
||
|
|
+
|
||
|
|
if (process.argv[2] === 'child') {
|
||
|
|
console.log(require(pkgName).string);
|
||
|
|
} else {
|
||
|
|
Index: node-v20.8.1/test/parallel/test-tls-passphrase.js
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/test/parallel/test-tls-passphrase.js
|
||
|
|
+++ node-v20.8.1/test/parallel/test-tls-passphrase.js
|
||
|
|
@@ -223,7 +223,7 @@ server.listen(0, common.mustCall(functio
|
||
|
|
}, onSecureConnect());
|
||
|
|
})).unref();
|
||
|
|
|
||
|
|
-const errMessageDecrypt = /bad decrypt/;
|
||
|
|
+const errMessageDecrypt = /bad (decrypt|password read)/;
|
||
|
|
|
||
|
|
// Missing passphrase
|
||
|
|
assert.throws(function() {
|
||
|
|
Index: node-v20.8.1/test/parallel/test-repl-envvars.js
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/test/parallel/test-repl-envvars.js
|
||
|
|
+++ node-v20.8.1/test/parallel/test-repl-envvars.js
|
||
|
|
@@ -2,7 +2,9 @@
|
||
|
|
|
||
|
|
// Flags: --expose-internals
|
||
|
|
|
||
|
|
-require('../common');
|
||
|
|
+const common = require('../common');
|
||
|
|
+common.skip('Not running test in OBS');
|
||
|
|
+
|
||
|
|
const stream = require('stream');
|
||
|
|
const { describe, test } = require('node:test');
|
||
|
|
const REPL = require('internal/repl');
|
||
|
|
Index: node-v20.8.1/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/Makefile
|
||
|
|
+++ node-v20.8.1/Makefile
|
||
|
|
@@ -545,7 +545,8 @@ test-ci-js: | clear-stalled
|
||
|
|
.PHONY: test-ci
|
||
|
|
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
|
||
|
|
test-ci: LOGLEVEL := info
|
||
|
|
-test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests doc-only
|
||
|
|
+test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests
|
||
|
|
+ strip $(NODE_EXE)
|
||
|
|
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) \
|
||
|
|
@@ -726,7 +727,8 @@ apidocs_json = $(addprefix out/,$(apidoc
|
||
|
|
apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
|
||
|
|
|
||
|
|
tools/doc/node_modules: tools/doc/package.json
|
||
|
|
- @if [ "$(shell $(node_use_openssl))" != "true" ]; then \
|
||
|
|
+ echo "Skipping tools/doc/node_modules"
|
||
|
|
+# @if [ "$(shell $(node_use_openssl))" != "true" ]; then \
|
||
|
|
echo "Skipping tools/doc/node_modules (no crypto)"; \
|
||
|
|
else \
|
||
|
|
cd tools/doc && $(call available-node,$(run-npm-ci)) \
|
||
|
|
Index: node-v20.8.1/tools/test.py
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/tools/test.py
|
||
|
|
+++ node-v20.8.1/tools/test.py
|
||
|
|
@@ -1361,7 +1361,7 @@ def BuildOptions():
|
||
|
|
result.add_option("-s", "--suite", help="A test suite",
|
||
|
|
default=[], action="append")
|
||
|
|
result.add_option("-t", "--timeout", help="Timeout in seconds",
|
||
|
|
- default=120, type="int")
|
||
|
|
+ default=1200, type="int")
|
||
|
|
result.add_option("--arch", help='The architecture to run tests for',
|
||
|
|
default='none')
|
||
|
|
result.add_option("--snapshot", help="Run the tests with snapshot turned on",
|
||
|
|
Index: node-v20.8.1/test/parallel/test-crypto-dh.js
|
||
|
|
===================================================================
|
||
|
|
--- node-v20.8.1.orig/test/parallel/test-crypto-dh.js
|
||
|
|
+++ node-v20.8.1/test/parallel/test-crypto-dh.js
|
||
|
|
@@ -87,9 +87,7 @@ const crypto = require('crypto');
|
||
|
|
|
||
|
|
assert.throws(() => {
|
||
|
|
dh3.computeSecret('');
|
||
|
|
- }, { message: common.hasOpenSSL3 ?
|
||
|
|
- 'error:02800080:Diffie-Hellman routines::invalid secret' :
|
||
|
|
- 'Supplied key is too small' });
|
||
|
|
+ }, /(error:02800080:Diffie-Hellman routines::invalid secret|error:05066066:Diffie-Hellman routines:compute_key:invalid public key|Supplied key is too small)/);
|
||
|
|
}
|
||
|
|
|
||
|
|
// Through a fluke of history, g=0 defaults to DH_GENERATOR (2).
|