Skip to content

dns: support dns module in the snapshot #44633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joyeecheung wants to merge 2 commits into from
Closed

dns: support dns module in the snapshot #44633

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acbe447
dns: support dns module in the snapshot
joyeecheung Sep 14, 2022
57e7507
fixup! dns: support dns module in the snapshot
joyeecheung Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! dns: support dns module in the snapshot 
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
@joyeecheung @aduh95
joyeecheung and aduh95 authored Sep 20, 2022
commit 57e75070940cf4a7eb10782afa5ab871bf8ad805
6 changes: 2 additions & 4 deletions lib/internal/dns/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const {
const {
addSerializeCallback,
addDeserializeCallback,
isBuildingSnapshot
isBuildingSnapshot,
} = require('v8').startupSnapshot;

function validateTimeout(options) {
Expand Down Expand Up @@ -212,9 +212,7 @@ function initializeDns() {
}

addSerializeCallback(() => {
if (defaultResolver !== undefined) {
defaultResolver[kSerializeResolver]();
}
defaultResolver?.[kSerializeResolver]();
});
}

Expand Down
8 changes: 4 additions & 4 deletions test/common/snapshot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function buildSnapshot(entry, env) {
cwd: tmpdir.path,
env: {
...process.env,
...env
}
...env,
},
});

const stderr = child.stderr.toString();
Expand All @@ -44,7 +44,7 @@ function runWithSnapshot(entry, env) {
cwd: tmpdir.path,
env: {
...process.env,
...env
...env,
}
});

Expand All @@ -62,5 +62,5 @@ function runWithSnapshot(entry, env) {

module.exports = {
buildSnapshot,
runWithSnapshot
runWithSnapshot,
};
2 changes: 1 addition & 1 deletion test/fixtures/snapshot/dns-lookup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const assert = require('assert');
assert(process.env.NODE_TEST_HOST);

const {
setDeserializeMainFunction
setDeserializeMainFunction,
} = require('v8').startupSnapshot;

function onError(err) {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/snapshot/dns-resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const assert = require('assert');
assert(process.env.NODE_TEST_HOST);

const {
setDeserializeMainFunction
setDeserializeMainFunction,
} = require('v8').startupSnapshot;

function onError(err) {
Expand Down
4 changes: 2 additions & 2 deletions test/internet/test-snapshot-dns-lookup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const {
addresses: { INET4_HOST }
addresses: { INET4_HOST },
} = require('../common/internet');

const entry = fixtures.path('snapshot', 'dns-lookup.js');
const env = {
NODE_TEST_HOST: INET4_HOST,
NODE_TEST_PROMISE: 'false'
NODE_TEST_PROMISE: 'false',
};

tmpdir.refresh();
Expand Down
4 changes: 2 additions & 2 deletions test/internet/test-snapshot-dns-resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ const tmpdir = require('../common/tmpdir');
const fixtures = require('../common/fixtures');
const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const {
addresses: { DNS4_SERVER, INET4_IP, INET4_HOST }
addresses: { DNS4_SERVER, INET4_IP, INET4_HOST },
} = require('../common/internet');

const entry = fixtures.path('snapshot', 'dns-resolve.js');
const env = {
NODE_TEST_IP: INET4_IP,
NODE_TEST_HOST: INET4_HOST,
NODE_TEST_DNS: DNS4_SERVER,
NODE_TEST_PROMISE: 'false'
NODE_TEST_PROMISE: 'false',
};

tmpdir.refresh();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-snapshot-dns-lookup-localhost-promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const entry = fixtures.path('snapshot', 'dns-lookup.js');
const env = {
NODE_TEST_HOST: 'localhost',
NODE_TEST_PROMISE: 'true'
NODE_TEST_PROMISE: 'true',
};

tmpdir.refresh();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-snapshot-dns-lookup-localhost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const entry = fixtures.path('snapshot', 'dns-lookup.js');
const env = {
NODE_TEST_HOST: 'localhost',
NODE_TEST_PROMISE: 'false'
NODE_TEST_PROMISE: 'false',
};

tmpdir.refresh();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-snapshot-dns-resolve-localhost-promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const entry = fixtures.path('snapshot', 'dns-resolve.js');
const env = {
NODE_TEST_HOST: 'localhost',
NODE_TEST_PROMISE: 'true'
NODE_TEST_PROMISE: 'true',
};

tmpdir.refresh();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-snapshot-dns-resolve-localhost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { buildSnapshot, runWithSnapshot } = require('../common/snapshot');
const entry = fixtures.path('snapshot', 'dns-resolve.js');
const env = {
NODE_TEST_HOST: 'localhost',
NODE_TEST_PROMISE: 'false'
NODE_TEST_PROMISE: 'false',
};

tmpdir.refresh();
Expand Down