From 2585ca44e1c776d1ceb7a0631f2ecffa58de5eb6 Mon Sep 17 00:00:00 2001 From: Wael Almattar Date: Sat, 22 May 2021 17:06:57 +0200 Subject: [PATCH 1/3] test: os, replace custom flatten method with built-in Array.flat --- test/parallel/test-os.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js index 6a5b43368249db..e5e92025b397ce 100644 --- a/test/parallel/test-os.js +++ b/test/parallel/test-os.js @@ -39,10 +39,6 @@ const is = { } }; -const flatten = (arr) => - arr.reduce((acc, c) => - acc.concat(Array.isArray(c) ? flatten(c) : c), []); - process.env.TMPDIR = '/tmpdir'; process.env.TMP = '/tmp'; process.env.TEMP = '/temp'; @@ -174,7 +170,8 @@ const netmaskToCIDRSuffixMap = new Map(Object.entries({ 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff': 128 })); -flatten(Object.values(interfaces)) +Object.values(interfaces).flat(Infinity) + .map((v) => ({ v, mask: netmaskToCIDRSuffixMap.get(v.netmask) })) .forEach(({ v, mask }) => { assert.ok('cidr' in v, `"cidr" prop not found in ${inspect(v)}`); From da09ed27e992bdd8de8f535398b5dc85a387ebf9 Mon Sep 17 00:00:00 2001 From: Wael Almattar Date: Sat, 22 May 2021 23:20:00 +0200 Subject: [PATCH 2/3] clean up extra line --- test/parallel/test-os.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js index e5e92025b397ce..04595a7d40de9b 100644 --- a/test/parallel/test-os.js +++ b/test/parallel/test-os.js @@ -171,7 +171,6 @@ const netmaskToCIDRSuffixMap = new Map(Object.entries({ })); Object.values(interfaces).flat(Infinity) - .map((v) => ({ v, mask: netmaskToCIDRSuffixMap.get(v.netmask) })) .forEach(({ v, mask }) => { assert.ok('cidr' in v, `"cidr" prop not found in ${inspect(v)}`); From 268c3df61076076b00e26494b4f45861deb3696f Mon Sep 17 00:00:00 2001 From: Wael Date: Mon, 24 May 2021 01:25:30 +0200 Subject: [PATCH 3/3] clean up code styling Co-authored-by: Darshan Sen --- test/parallel/test-os.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js index 04595a7d40de9b..922bab276bcb3c 100644 --- a/test/parallel/test-os.js +++ b/test/parallel/test-os.js @@ -170,7 +170,8 @@ const netmaskToCIDRSuffixMap = new Map(Object.entries({ 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff': 128 })); -Object.values(interfaces).flat(Infinity) +Object.values(interfaces) + .flat(Infinity) .map((v) => ({ v, mask: netmaskToCIDRSuffixMap.get(v.netmask) })) .forEach(({ v, mask }) => { assert.ok('cidr' in v, `"cidr" prop not found in ${inspect(v)}`);