Commit in nodejs-lts-gallium/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, October 21, 2022 @ 13:39:00
  Author: foutrelis
Revision: 1333078

Fix test-socket-write-after-fin-error

Added:
  nodejs-lts-gallium/trunk/fix-test-socket-write-after-fin-error.patch
Modified:
  nodejs-lts-gallium/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |    3 +
 fix-test-socket-write-after-fin-error.patch |   40 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-21 13:37:41 UTC (rev 1333077)
+++ PKGBUILD    2022-10-21 13:39:00 UTC (rev 1333078)
@@ -15,9 +15,11 @@
 provides=("nodejs=$pkgver")
 conflicts=(nodejs)
 source=(${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz
+        fix-test-socket-write-after-fin-error.patch
         icu72.patch)
 # https://nodejs.org/download/release/latest-gallium/SHASUMS256.txt.asc
 sha256sums=('145151eff3b2aa5ebe73384009c52271a83740ae687a93c98c628cd7d52736eb'
+            'bb4df6373e4ab93478089268949934efbdd7bb060f35e8d7262af6b2dda4b948'
             '886d0edf868c39567124937f93a43fb3e92fa65b5244b8c608d6482ed217fa56')
 validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins 
<mylesbor...@google.com>
               77984A986EBC2AA786BC0F66B01FBB92821C587A  # Gibson Fahnestock 
<gibf...@gmail.com>
@@ -31,6 +33,7 @@
 
 prepare() {
   cd node-v${pkgver}
+  patch -Np1 -i ../fix-test-socket-write-after-fin-error.patch
   patch -Np1 -i ../icu72.patch
 }
 

Added: fix-test-socket-write-after-fin-error.patch
===================================================================
--- fix-test-socket-write-after-fin-error.patch                         (rev 0)
+++ fix-test-socket-write-after-fin-error.patch 2022-10-21 13:39:00 UTC (rev 
1333078)
@@ -0,0 +1,40 @@
+From 1c0fb51e475ae0a86a4ea5394d5ec94930379646 Mon Sep 17 00:00:00 2001
+From: Luigi Pinca <luigipi...@gmail.com>
+Date: Tue, 12 Jul 2022 22:11:10 +0200
+Subject: [PATCH] test: fix test-socket-write-after-fin-error
+
+The `'error'` event is not emitted because the socket is already
+destroyed when `socket.write()` is called. Use the `socket.write()`
+callback instead.
+---
+ test/parallel/test-socket-write-after-fin-error.js | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/parallel/test-socket-write-after-fin-error.js 
b/test/parallel/test-socket-write-after-fin-error.js
+index 64c8143abebb..0e3b99abac75 100644
+--- a/test/parallel/test-socket-write-after-fin-error.js
++++ b/test/parallel/test-socket-write-after-fin-error.js
+@@ -16,10 +16,7 @@ let gotServerError = false;
+ 
+ const server = net.createServer(function(sock) {
+   sock.setEncoding('utf8');
+-  sock.on('error', function(er) {
+-    console.error(`${er.code}: ${er.message}`);
+-    gotServerError = er;
+-  });
++  sock.on('error', function() {});
+ 
+   sock.on('data', function(c) {
+     serverData += c;
+@@ -27,7 +24,10 @@ const server = net.createServer(function(sock) {
+   sock.on('end', function() {
+     gotServerEnd = true;
+     setImmediate(() => {
+-      sock.write(serverData);
++      sock.write(serverData, function(er) {
++        console.error(`${er.code}: ${er.message}`);
++        gotServerError = er;
++      });
+       sock.end();
+     });
+   });