From 01db593507499aae6ff403b1090f0cf01e7f7a6b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 6 Jul 2016 20:26:05 -0700 Subject: [PATCH 1/2] test: fix flaky test/fs-read-buffer-tostring-fail The test is memory intensive and times out occasionally on Raspberry Pi devices in CI. Successful test runs take about 90 seconds, but the devices time out after 120 seconds. That's not a lot of headroom. So let's skip the test on devices that have only modest amounts of memory. Fixes: https://github.com/nodejs/node/issues/7042 --- test/parallel/test-fs-read-buffer-tostring-fail.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/parallel/test-fs-read-buffer-tostring-fail.js b/test/parallel/test-fs-read-buffer-tostring-fail.js index 3a3f77c05bb016..756244738f8c88 100644 --- a/test/parallel/test-fs-read-buffer-tostring-fail.js +++ b/test/parallel/test-fs-read-buffer-tostring-fail.js @@ -1,6 +1,13 @@ 'use strict'; const common = require('../common'); + +const skipMessage = 'intensive toString tests due to memory confinements'; +if (!common.enoughTestMem) { + common.skip(skipMessage); + return; +} + const assert = require('assert'); const fs = require('fs'); const path = require('path'); From 6e00a03c0a35b3cc705f521c0c6152d64d84b00b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 6 Jul 2016 22:05:52 -0700 Subject: [PATCH 2/2] squash: move --- test/parallel/test-fs-read-buffer-tostring-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-fs-read-buffer-tostring-fail.js b/test/parallel/test-fs-read-buffer-tostring-fail.js index 756244738f8c88..cce33edf4e6947 100644 --- a/test/parallel/test-fs-read-buffer-tostring-fail.js +++ b/test/parallel/test-fs-read-buffer-tostring-fail.js @@ -2,8 +2,8 @@ const common = require('../common'); -const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) { + const skipMessage = 'intensive toString tests due to memory confinements'; common.skip(skipMessage); return; }