Skip to content

Commit eeedd77

Browse files
cjihrigStephen Belanger
authored andcommitted
test: don't skip when common.mustCall() is pending
The test parallel/test-dgram-multicast-set-interface.js was calling common.skip() on hosts that do not support IPv6. However, by this point, there were several outstanding common.mustCall() invocations. The process.exit() in common.skip() triggered those common.mustCall()s as errors. Fixes: nodejs/node#15419 PR-URL: nodejs/node#15421 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Brian White <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]>
1 parent b2fed41 commit eeedd77

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

test/parallel/test-dgram-multicast-set-interface.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,11 @@ const dgram = require('dgram');
7272
}));
7373
}
7474

75-
<<<<<<< HEAD
7675
// If IPv6 is not supported, skip the rest of the test. However, don't call
7776
// common.skip(), which calls process.exit() while there is outstanding
7877
// common.mustCall() activity.
7978
if (!common.hasIPv6)
8079
return;
81-
=======
82-
if (!common.hasIPv6) {
83-
common.skip('Skipping udp6 tests, no IPv6 support.');
84-
return;
85-
}
86-
>>>>>>> 4ae0afb12b... dgram: added setMulticastInterface()
8780

8881
{
8982
const socket = dgram.createSocket('udp6');

0 commit comments

Comments
 (0)