summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Reiss <me@silverwind.io>2015-08-29 09:41:27 +0200
committerRoman Reiss <me@silverwind.io>2015-08-29 20:00:10 +0200
commit83c2c3b67607e6dc268e24ff390bf8a2344d1ec1 (patch)
treeb01b3f61c2a31c4c0fc2f111bcf84b9064d35b75
parent4c5fc3b1d4f1091135b5340c220d28ab4258a1df (diff)
downloadandroid-node-v8-83c2c3b67607e6dc268e24ff390bf8a2344d1ec1.tar.gz
android-node-v8-83c2c3b67607e6dc268e24ff390bf8a2344d1ec1.tar.bz2
android-node-v8-83c2c3b67607e6dc268e24ff390bf8a2344d1ec1.zip
test: lint and refactor to avoid autocrlf issue
The test was failing after adding 'use strict' because the windows CI uses the autocrlf option of git which converts \r into \r\n on checkout. Refactored the test to not read itself anymore and create a temp file on the fly instead to avoid this line-ending issue. PR-URL: https://github.com/nodejs/node/pull/2494 Reviewed-By: Joao Reis <reis@janeasystems.com>
-rw-r--r--.eslintignore1
-rw-r--r--test/parallel/test-fs-non-number-arguments-throw.js33
2 files changed, 20 insertions, 14 deletions
diff --git a/.eslintignore b/.eslintignore
index ef029bad5e..6f1caaa873 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,6 +2,5 @@ lib/punycode.js
test/addons/doc-*/
test/fixtures
test/**/node_modules
-test/parallel/test-fs-non-number-arguments-throw.js
test/disabled
test/tmp*/
diff --git a/test/parallel/test-fs-non-number-arguments-throw.js b/test/parallel/test-fs-non-number-arguments-throw.js
index 7a1e7bdb52..8f34a1fcbb 100644
--- a/test/parallel/test-fs-non-number-arguments-throw.js
+++ b/test/parallel/test-fs-non-number-arguments-throw.js
@@ -1,24 +1,31 @@
-var assert = require('assert'),
- fs = require('fs'),
- saneEmitter,
- sanity = 'ire(\'assert\')';
+'use strict';
-saneEmitter = fs.createReadStream(__filename, { start: 17, end: 29 });
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const tempFile = path.join(common.tmpDir, 'fs-non-number-arguments-throw');
-assert.throws(function () {
- fs.createReadStream(__filename, { start: "17", end: 29 });
+common.refreshTmpDir();
+fs.writeFileSync(tempFile, 'abc\ndef');
+
+// a sanity check when using numbers instead of strings
+const sanity = 'def';
+const saneEmitter = fs.createReadStream(tempFile, { start: 4, end: 6 });
+
+assert.throws(function() {
+ fs.createReadStream(tempFile, { start: '4', end: 6 });
}, "start as string didn't throw an error for createReadStream");
-assert.throws(function () {
- fs.createReadStream(__filename, { start: 17, end: "29" });
+assert.throws(function() {
+ fs.createReadStream(tempFile, { start: 4, end: '6' });
}, "end as string didn't throw an error");
-assert.throws(function () {
- fs.createWriteStream(__filename, { start: "17" });
+assert.throws(function() {
+ fs.createWriteStream(tempFile, { start: '4' });
}, "start as string didn't throw an error for createWriteStream");
-saneEmitter.on('data', function (data) {
- // a sanity check when using numbers instead of strings
+saneEmitter.on('data', function(data) {
assert.strictEqual(sanity, data.toString('utf8'), 'read ' +
data.toString('utf8') + ' instead of ' + sanity);
});