From b7cfa990c7a83271e17a0a543b528d41bf0d5e14 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 20 Sep 2022 14:19:40 +0000 Subject: [PATCH] Workaround unit tests in staging Really remove unused patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs18?expand=0&rev=11 --- dns.patch | 30 ------------------------------ nodejs18.spec | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 dns.patch diff --git a/dns.patch b/dns.patch deleted file mode 100644 index aec263b..0000000 --- a/dns.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: node-v18.7.0/lib/net.js -=================================================================== ---- node-v18.7.0.orig/lib/net.js -+++ node-v18.7.0/lib/net.js -@@ -1072,6 +1072,16 @@ Socket.prototype.connect = function(...a - return this; - }; - -+function socketToDnsFamily(family) { -+ switch (family) { -+ case 'IPv4': -+ return 4; -+ case 'IPv6': -+ return 6; -+ } -+ -+ return family; -+} - - function lookupAndConnect(self, options) { - const { localAddress, localPort } = options; -@@ -1114,7 +1124,7 @@ function lookupAndConnect(self, options) - - if (dns === undefined) dns = require('dns'); - const dnsopts = { -- family: options.family, -+ family: socketToDnsFamily(options.family), - hints: options.hints || 0 - }; - diff --git a/nodejs18.spec b/nodejs18.spec index da4f5ce..a8f2b53 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -906,16 +906,30 @@ rm -f test/parallel/test-dns-cancel-reverse-lookup.js \ test/parallel/test-dns-resolveany.js # multicast test fail since no socket? rm -f test/parallel/test-dgram-membership.js + +%if %{node_version_number} >= 18 +# OBS broken /etc/hosts -- https://github.com/openSUSE/open-build-service/issues/13104 +rm -f parallel/test-net-socket-connect-without-cb.js parallel/test-tcp-wrap-listen.js +%endif + %if 0%{?fedora_version} # test/parallel/test-crypto-certificate.js requires OPENSSL_ENABLE_MD5_VERIFY=1 # as SPKAC required MD5 for verification # https://src.fedoraproject.org/rpms/openssl/blob/rawhide/f/0006-Disable-signature-verification-with-totally-unsafe-h.patch export OPENSSL_ENABLE_MD5_VERIFY=1 +# test failures # error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake # failure:ssl/record/rec_layer_s3.c:1543:SSL alert number 40 -rm -f test/parallel/test-tls-no-sslv3.js +rm test/parallel/test-tls-no-sslv3.js +%if %{node_version_number} >= 18 +rm -r test/addons/openssl-providers +rm test/parallel/test-crypto-fips.js %endif + +%endif +# fedora + # Run CI tests %if 0%{with valgrind_tests} # valgrind may have false positives, so do not fail on these by default