From 618d68e01069ba5bf13a7a894ffbebc127f55f82 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Tue, 21 Mar 2023 21:44:52 +0000 Subject: user/node: re-enable flaky tests. These tests fail when /etc/hosts does not contain an IPv6 entry for localhost ('::1 localhost'). It isn't immediately clear to me whether the tests are therefore buggy, or if we want to put the blame on a non-conforming build environment. This was initially discovered on a system that only had an IPv4 entry ('127.0.0.1 localhost'), which occurred because the autobuilder tool copied /etc/{hosts,hostname,resolv.conf} from the host into the rootfs for each build environment, and each host may be running a different Linux distribution. This is being addressed in adelie-infra/autobuilder#33, which will ensure build environments are consistent in this way. --- user/node/APKBUILD | 4 +--- user/node/flaky-tests.patch | 12 ------------ 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 user/node/flaky-tests.patch (limited to 'user') diff --git a/user/node/APKBUILD b/user/node/APKBUILD index 6cd046b61..f80c30a8f 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz pmmx-test.patch pmmx-time64.patch - flaky-tests.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -67,5 +66,4 @@ package() { sha512sums="e41fcda469809186fd724ef4691e25f4a5bd81357ee99acf3d7faa1190a69c19cb62bd14aea199ca6f8b5cf9687af7d898cdf605ea2414d2c04db87ddb3b4dc8 node-v18.15.0.tar.xz 277e226f3906f791bae6aedd0b74b0e2c52b6154eb2dc0c568417ad94a0722078e4fbbbe15c59d4ba0b59cdb4ad45b5e9620f14d75694a15531857cd29aa044a pmmx-test.patch -bf78e52c60b4567854eaa9d9433ade8a318a356cb326dded99e800df35a9f475390a0cf8b0c8e595bbdb3702838eafe91801cd646576aa7fa7966b37d794e380 pmmx-time64.patch -1df6974e6f4acca31a553426437233c2736a5b509e0d31b00d13d83d644800bf0703c61fe05df4dff9fe07a08cd6997b38177fb264e09eae58464623a548ff7d flaky-tests.patch" +bf78e52c60b4567854eaa9d9433ade8a318a356cb326dded99e800df35a9f475390a0cf8b0c8e595bbdb3702838eafe91801cd646576aa7fa7966b37d794e380 pmmx-time64.patch" diff --git a/user/node/flaky-tests.patch b/user/node/flaky-tests.patch deleted file mode 100644 index d6e324d14..000000000 --- a/user/node/flaky-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/test/parallel/parallel.status b/test/parallel/parallel.status ---- a/test/parallel/parallel.status 2023-03-21 14:29:32.852950139 +0000 -+++ b/test/parallel/parallel.status 2023-03-21 14:31:20.736931283 +0000 -@@ -17,6 +17,8 @@ - [$system==linux] - # https://github.com/nodejs/node/issues/39368 - test-domain-error-types: PASS,FLAKY -+test-net-socket-connect-without-cb: SKIP -+test-tcp-wrap-listen: SKIP - - [$system==macos] - # https://github.com/nodejs/node/issues/42741 -- cgit v1.2.3-70-g09d2