summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cornacchia <cornacch@ca.ibm.com>2015-11-06 12:51:48 -0500
committerTrevor Norris <trev.norris@gmail.com>2015-12-02 15:00:27 -0700
commita40b9cab0ac64436c6750859127062f85445c1e6 (patch)
treea72c45cafae71f847a724ffaa98c1e808123163a
parentb619831381a3a93e64e963b7bd95adc4df2eafe7 (diff)
downloadandroid-node-v8-a40b9cab0ac64436c6750859127062f85445c1e6.tar.gz
android-node-v8-a40b9cab0ac64436c6750859127062f85445c1e6.tar.bz2
android-node-v8-a40b9cab0ac64436c6750859127062f85445c1e6.zip
test: skip instead of fail when mem constrained
The current implementation of tests for strings with length at or exceeding kStringMaxLength allocate a temporary buffer inside a try block to skip the test if there is insufficient memory. This commit adds an invocation of the garbage collector after the temporary buffer is allocated so that memory is freed for later allocations. Change the corresponding catch block to rethrow the original exception instead of asserting the exception message to provide more information about the exception. Add an additional check before trying to allocate memory to immediately skip the test on machines with insufficient total memory. PR-URL: https://github.com/nodejs/node/pull/3697 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michaƫl Zasso <mic.besace@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
-rw-r--r--test/common.js2
-rw-r--r--test/parallel/test-stringbytes-external-at-max.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js24
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max-by-2.js26
-rw-r--r--test/parallel/test-stringbytes-external-exceed-max.js26
9 files changed, 140 insertions, 58 deletions
diff --git a/test/common.js b/test/common.js
index 470f2f4688..5fb1e05a5f 100644
--- a/test/common.js
+++ b/test/common.js
@@ -22,6 +22,8 @@ exports.isLinuxPPCBE = (process.platform === 'linux') &&
exports.isSunOS = process.platform === 'sunos';
exports.isFreeBSD = process.platform === 'freebsd';
+exports.enoughTestMem = os.totalmem() > 0x20000000; /* 512MB */
+
function rimrafSync(p) {
try {
var st = fs.lstatSync(p);
diff --git a/test/parallel/test-stringbytes-external-at-max.js b/test/parallel/test-stringbytes-external-at-max.js
index 6678e53552..31f476d66b 100644
--- a/test/parallel/test-stringbytes-external-at-max.js
+++ b/test/parallel/test-stringbytes-external-at-max.js
@@ -1,22 +1,32 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength);
-
const maxString = buf.toString('binary');
assert.equal(maxString.length, kStringMaxLength);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
index aab34e5448..46590cd492 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 1);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength + 1);
-
assert.throws(function() {
buf.toString('ascii');
}, /"toString\(\)" failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
index 62e3a4c1d2..905f4ac973 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 1);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength + 1);
-
assert.throws(function() {
buf.toString('base64');
}, /"toString\(\)" failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
index 2827150729..9564af08de 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 1);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength + 1);
-
assert.throws(function() {
buf.toString('binary');
}, /"toString\(\)" failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
index 08b76ce6bd..1ca75403c2 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 1);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength + 1);
-
assert.throws(function() {
buf.toString('hex');
}, /"toString\(\)" failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
index a566af0a94..5e4bca5c9a 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 1);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf = new Buffer(kStringMaxLength + 1);
-
assert.throws(function() {
buf.toString();
}, /"toString\(\)" failed|Invalid array buffer length/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-2.js b/test/parallel/test-stringbytes-external-exceed-max-by-2.js
index 879e4ae91d..8350c4532e 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-2.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-2.js
@@ -1,22 +1,32 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength + 2);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf2 = new Buffer(kStringMaxLength + 2);
-
-const maxString = buf2.toString('utf16le');
+const maxString = buf.toString('utf16le');
assert.equal(maxString.length, (kStringMaxLength + 2) / 2);
diff --git a/test/parallel/test-stringbytes-external-exceed-max.js b/test/parallel/test-stringbytes-external-exceed-max.js
index 4bec036993..33bc2eaee7 100644
--- a/test/parallel/test-stringbytes-external-exceed-max.js
+++ b/test/parallel/test-stringbytes-external-exceed-max.js
@@ -1,23 +1,33 @@
'use strict';
+// Flags: --expose-gc
-require('../common');
+const common = require('../common');
const assert = require('assert');
+const skipMessage =
+ '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+ console.log(skipMessage);
+ return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
// v8 fails silently if string length > v8::String::kMaxLength
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
try {
- new Buffer(kStringMaxLength * 3);
+ var buf = new Buffer(kStringMaxLength * 2 + 2);
+ // Try to allocate memory first then force gc so future allocations succeed.
+ new Buffer(2 * kStringMaxLength);
+ gc();
} catch(e) {
- assert.equal(e.message, 'Invalid array buffer length');
- console.log(
- '1..0 # Skipped: intensive toString tests due to memory confinements');
+ // If the exception is not due to memory confinement then rethrow it.
+ if (e.message !== 'Invalid array buffer length') throw (e);
+ console.log(skipMessage);
return;
}
-const buf0 = new Buffer(kStringMaxLength * 2 + 2);
-
assert.throws(function() {
- buf0.toString('utf16le');
+ buf.toString('utf16le');
}, /"toString\(\)" failed/);