From ddf258376dd35d5813255b921701a75b28611979 Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Tue, 22 Sep 2015 18:31:01 +0200 Subject: [PATCH] test: use normalize() for unicode paths MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit OS X 10.11 changed the unicode normalization form of certain code points returned by system calls like getcwd() from NFC to NFD which made results in this test failing. The consensus of https://github.com/nodejs/node/issues/2165 is to delegate the task of unicode normalization to the user, and work will continue to document how to handle unicode in a form-sensitive file system. PR-URL: https://github.com/nodejs/node/pull/3007 Fixes: https://github.com/nodejs/node/issues/2165 Reviewed-By: Johan Bergström Reviewed-By: Jeremiah Senkpiel Reviewed-By: Sakthipriyan Vairamani --- test/parallel/test-process-chdir.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-process-chdir.js b/test/parallel/test-process-chdir.js index ed8bf83..abf06b3 100644 --- a/test/parallel/test-process-chdir.js +++ b/test/parallel/test-process-chdir.js @@ -9,18 +9,26 @@ assert.notStrictEqual(process.cwd(), __dirname); process.chdir(__dirname); assert.strictEqual(process.cwd(), __dirname); -const dir = path.resolve(common.tmpDir, - 'weird \uc3a4\uc3ab\uc3af characters \u00e1\u00e2\u00e3'); +let dirName; +if (process.versions.icu) { + // ICU is available, use characters that could possibly be decomposed + dirName = 'weird \uc3a4\uc3ab\uc3af characters \u00e1\u00e2\u00e3'; +} else { + // ICU is unavailable, use characters that can't be decomposed + dirName = 'weird \ud83d\udc04 characters \ud83d\udc05'; +} +const dir = path.resolve(common.tmpDir, dirName); // Make sure that the tmp directory is clean common.refreshTmpDir(); fs.mkdirSync(dir); process.chdir(dir); -assert.strictEqual(process.cwd(), dir); +assert.strictEqual(process.cwd().normalize(), dir.normalize()); process.chdir('..'); -assert.strictEqual(process.cwd(), path.resolve(common.tmpDir)); +assert.strictEqual(process.cwd().normalize(), + path.resolve(common.tmpDir).normalize()); assert.throws(function() { process.chdir({}); }, TypeError, 'Bad argument.'); assert.throws(function() { process.chdir(); }, TypeError, 'Bad argument.'); -- 2.7.4