Skip to content

Commit

Permalink
ci: windows: fix dns.getServers test (#11309)
Browse files Browse the repository at this point in the history
Co-authored-by: nektro <[email protected]>
Co-authored-by: Jarred Sumner <[email protected]>
  • Loading branch information
3 people authored May 25, 2024
1 parent c689b2b commit aa3aa88
Showing 1 changed file with 10 additions and 16 deletions.
26 changes: 10 additions & 16 deletions test/js/node/dns/node-dns.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ test("dns.resolveNs (bun.sh) ", done => {
test("dns.resolveNs (empty string) ", done => {
dns.resolveNs("", (err, results) => {
expect(err).toBeNull();
console.log("resolveNs:", results);

expect(results instanceof Array).toBe(true);
// root servers
Expand Down Expand Up @@ -192,6 +193,7 @@ test("dns.resolveNs (empty string) ", done => {
test("dns.resolvePtr (ptr.socketify.dev)", done => {
dns.resolvePtr("ptr.socketify.dev", (err, results) => {
expect(err).toBeNull();
console.log("resolvePtr:", results);
expect(results instanceof Array).toBe(true);
expect(results[0]).toBe("bun.sh");
done(err);
Expand All @@ -201,6 +203,7 @@ test("dns.resolvePtr (ptr.socketify.dev)", done => {
test("dns.resolveCname (cname.socketify.dev)", done => {
dns.resolveCname("cname.socketify.dev", (err, results) => {
expect(err).toBeNull();
console.log("resolveCname:", results);
expect(results instanceof Array).toBe(true);
expect(results[0]).toBe("bun.sh");
done(err);
Expand Down Expand Up @@ -236,18 +239,14 @@ test("dns.lookup (localhost)", done => {
});
});

test.skipIf(isWindows)("dns.getServers", done => {
test("dns.getServers", () => {
function parseResolvConf() {
const servers = [];
if (isWindows) {
// TODO: fix this, is not working on CI
const { stdout } = Bun.spawnSync(["ipconfig"], { stdout: "pipe" });
for (const line of stdout.toString("utf8").split(os.EOL)) {
if (line.indexOf("Default Gateway") !== -1) {
servers.push(line.split(":")[1].trim());
}
}
return servers;
const { stdout } = Bun.spawnSync(["node", "-e", "dns.getServers().forEach(x => console.log(x))"], {
stdout: "pipe",
});
return stdout.toString("utf8").trim().split("\n");
}

try {
Expand All @@ -268,14 +267,9 @@ test.skipIf(isWindows)("dns.getServers", done => {

const expectServers = parseResolvConf();
const actualServers = dns.getServers();
try {
for (const server of expectServers) {
expect(actualServers).toContain(server);
}
} catch (err) {
return done(err);
for (const server of expectServers) {
expect(actualServers).toContain(server);
}
done();
});

test("dns.reverse", done => {
Expand Down

0 comments on commit aa3aa88

Please sign in to comment.