Skip to content

Backport fixes to v1.x #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fishrock123 merged 6 commits into from
May 14, 2015
Merged

Backport fixes to v1.x #1560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71274b0
tls_wrap: use localhost if options.host is empty
sitegui Apr 21, 2015
5896fe5
test: adjust Makefile/test-ci, add to vcbuild.bat
rvagg Apr 26, 2015
65dd10e
build: remove -J from test-ci
rvagg Apr 28, 2015
898d423
string_decoder: don't cache Buffer.isEncoding
mscdex Apr 28, 2015
4030545
fs: validate fd on fs.write
julianduque Apr 28, 2015
32a6dbc
test: extend timeouts for ARMv6
rvagg Apr 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: extend timeouts for ARMv6 
Based on tests running on original Raspberry Pi

PR-URL: #1554
PORT-PR-URL: #1560
PORT-FROM: v2.x / f9b226c
Reviewed-By: Roman Reiss <me@silverwind.io>
  • Loading branch information
@rvagg @Fishrock123
rvagg authored and Fishrock123 committed May 14, 2015
commit 32a6dbcf23d86386800551967c2df06e156d6a62
2 changes: 1 addition & 1 deletion test/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ exports.platformTimeout = function(ms) {
return ms;

if (process.config.variables.arm_version === '6')
return 6 * ms; // ARMv6
return 7 * ms; // ARMv6

return 2 * ms; // ARMv7 and up.
};
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-fork-net2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ if (process.argv[2] === 'child') {
};

var min = 190;
var max = common.platformTimeout(1500);
var max = common.platformTimeout(2000);
process.on('exit', function() {
assert.equal(disconnected, count);
assert.equal(connected, count);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-debug-signal-cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function onNoMoreLines() {

setTimeout(function testTimedOut() {
assert(false, 'test timed out.');
}, common.platformTimeout(3000)).unref();
}, common.platformTimeout(4000)).unref();

process.on('exit', function onExit() {
// Kill processes in reverse order to avoid timing problems on Windows where
Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-next-tick-error-spin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (process.argv[2] !== 'child') {
});
var timer = setTimeout(function() {
throw new Error('child is hung');
}, 3000);
}, common.platformTimeout(3000));
child.on('exit', function(code) {
console.error('ok');
assert(!code);
Expand Down