Skip to content

Commit 923d4f4

Browse files
committed
test: fix failing tests on CI
fix failing tests in the previous commit Fixes: #60936
1 parent d5f0350 commit 923d4f4

File tree

3 files changed

+58
-10
lines changed

3 files changed

+58
-10
lines changed

test/parallel/test-fs-readdir-promise-recursive-with-buffer.js

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,27 @@
44
// Refs: https://github.com/nodejs/node/issues/58892
55

66
const common = require('../common');
7+
const tmpdir = require('../common/tmpdir');
78

8-
const { readdir } = require('node:fs/promises');
9+
const assert = require('node:assert');
10+
const { readdir, mkdir, writeFile } = require('node:fs/promises');
911
const { join } = require('node:path');
1012

11-
const testDirPath = join(__dirname, '..', '..');
12-
readdir(Buffer.from(testDirPath), { recursive: true }).then(common.mustCall());
13+
async function runTest() {
14+
tmpdir.refresh();
1315

14-
readdir(Buffer.from(testDirPath), { recursive: true, withFileTypes: true }).then(common.mustCall());
16+
const subdir = join(tmpdir.path, 'subdir');
17+
await mkdir(subdir);
18+
await writeFile(join(tmpdir.path, 'file1.txt'), 'content1');
19+
await writeFile(join(subdir, 'file2.txt'), 'content2');
20+
21+
const result1 = await readdir(Buffer.from(tmpdir.path), { recursive: true });
22+
assert(Array.isArray(result1));
23+
assert.strictEqual(result1.length, 3);
24+
25+
const result2 = await readdir(Buffer.from(tmpdir.path), { recursive: true, withFileTypes: true });
26+
assert(Array.isArray(result2));
27+
assert.strictEqual(result2.length, 3);
28+
}
29+
30+
runTest().then(common.mustCall());

test/parallel/test-fs-readdir-recursive-with-buffer.js

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,27 @@
44
// Refs: https://github.com/nodejs/node/issues/58892
55

66
const common = require('../common');
7+
const tmpdir = require('../common/tmpdir');
78

8-
const { readdir } = require('node:fs');
9+
const assert = require('node:assert');
10+
const { readdir, mkdirSync, writeFileSync } = require('node:fs');
911
const { join } = require('node:path');
1012

11-
const testDirPath = join(__dirname, '..', '..');
12-
readdir(Buffer.from(testDirPath), { recursive: true }, common.mustCall());
13+
tmpdir.refresh();
14+
15+
const subdir = join(tmpdir.path, 'subdir');
16+
mkdirSync(subdir);
17+
writeFileSync(join(tmpdir.path, 'file1.txt'), 'content1');
18+
writeFileSync(join(subdir, 'file2.txt'), 'content2');
19+
20+
readdir(Buffer.from(tmpdir.path), { recursive: true }, common.mustCall((err, result) => {
21+
assert.ifError(err);
22+
assert(Array.isArray(result));
23+
assert.strictEqual(result.length, 3);
24+
}));
25+
26+
readdir(Buffer.from(tmpdir.path), { recursive: true, withFileTypes: true }, common.mustCall((err, result) => {
27+
assert.ifError(err);
28+
assert(Array.isArray(result));
29+
assert.strictEqual(result.length, 3);
30+
}));

test/parallel/test-fs-readdir-sync-recursive-with-buffer.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@
44
// Refs: https://github.com/nodejs/node/issues/58892
55

66
require('../common');
7+
const tmpdir = require('../common/tmpdir');
78

8-
const { readdirSync } = require('node:fs');
9+
const assert = require('node:assert');
10+
const { readdirSync, mkdirSync, writeFileSync } = require('node:fs');
911
const { join } = require('node:path');
1012

11-
const testDirPath = join(__dirname, '..', '..');
12-
readdirSync(Buffer.from(testDirPath), { recursive: true });
13+
tmpdir.refresh();
14+
15+
const subdir = join(tmpdir.path, 'subdir');
16+
mkdirSync(subdir);
17+
writeFileSync(join(tmpdir.path, 'file1.txt'), 'content1');
18+
writeFileSync(join(subdir, 'file2.txt'), 'content2');
19+
20+
const result1 = readdirSync(Buffer.from(tmpdir.path), { recursive: true });
21+
assert(Array.isArray(result1));
22+
assert.strictEqual(result1.length, 3);
23+
24+
const result2 = readdirSync(Buffer.from(tmpdir.path), { recursive: true, withFileTypes: true });
25+
assert(Array.isArray(result2));
26+
assert.strictEqual(result2.length, 3);

0 commit comments

Comments
 (0)