test: use tmpDir instead of fixtures in readdir

This patch - makes the test use tmp directory instead of the fixtures directory, - simplifies the code - moves the test to `parallel`. PR-URL: #2587 Reviewed-By: Rich Trott <[email protected]>
nodejs · Sep 20, 2015 · 816f609 · 816f609
1 parent bc9f629
commit 816f609
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 71 deletions.
diff --git a/test/fixtures/readdir/are b/test/fixtures/readdir/are
diff --git a/test/fixtures/readdir/dir/empty b/test/fixtures/readdir/dir/empty
diff --git a/test/fixtures/readdir/empty b/test/fixtures/readdir/empty
diff --git a/test/fixtures/readdir/files b/test/fixtures/readdir/files
diff --git a/test/fixtures/readdir/for b/test/fixtures/readdir/for
diff --git a/test/fixtures/readdir/just b/test/fixtures/readdir/just
diff --git a/test/fixtures/readdir/testing.js b/test/fixtures/readdir/testing.js
diff --git a/test/fixtures/readdir/these b/test/fixtures/readdir/these
diff --git a/test/parallel/test-fs-readdir.js b/test/parallel/test-fs-readdir.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+
+const readdirDir = common.tmpDir;
+const files = ['empty', 'files', 'for', 'just', 'testing'];
+
+// Make sure tmp directory is clean
+common.refreshTmpDir();
+
+// Create the necessary files
+files.forEach(function(currentFile) {
+  fs.closeSync(fs.openSync(readdirDir + '/' + currentFile, 'w'));
+});
+
+// Check the readdir Sync version
+assert.deepEqual(files, fs.readdirSync(readdirDir).sort());
+
+// Check the readdir async version
+fs.readdir(readdirDir, common.mustCall(function(err, f) {
+  assert.ifError(err);
+  assert.deepEqual(files, f.sort());
+}));
+
+// readdir() on file should throw ENOTDIR
+// https://github.com/joyent/node/issues/1869
+assert.throws(function() {
+  fs.readdirSync(__filename);
+}, /Error: ENOTDIR: not a directory/);
+
+fs.readdir(__filename, common.mustCall(function(e) {
+  assert.equal(e.code, 'ENOTDIR');
+}));
diff --git a/test/sequential/test-readdir.js b/test/sequential/test-readdir.js