From a772877ae1841a4a772851f385c902a321f03ae0 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Fri, 14 Jul 2017 19:59:25 -0400 Subject: [PATCH] test(image-stream): move extraction timeout to a shared constant (#1599) The image stream tests that extract images all have a 20s timeout, which is manually set in all the suites related to extraction. This commit extracts that number as a constant called DEFAULT_TIMEOUT. See: https://github.com/resin-io/etcher/pull/1595 Signed-off-by: Juan Cruz Viotti --- tests/image-stream/archive-hooks/zip.spec.js | 3 ++- tests/image-stream/bz2.spec.js | 2 +- tests/image-stream/dmg.spec.js | 2 +- tests/image-stream/gz.spec.js | 2 +- tests/image-stream/img.spec.js | 2 +- tests/image-stream/iso.spec.js | 2 +- tests/image-stream/tester.js | 2 ++ tests/image-stream/xz.spec.js | 2 +- tests/image-stream/zip.spec.js | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/image-stream/archive-hooks/zip.spec.js b/tests/image-stream/archive-hooks/zip.spec.js index 40730d05..27c5fa94 100644 --- a/tests/image-stream/archive-hooks/zip.spec.js +++ b/tests/image-stream/archive-hooks/zip.spec.js @@ -20,11 +20,12 @@ const m = require('mochainon'); const path = require('path'); const zipHooks = require('../../../lib/image-stream/archive-hooks/zip'); const utils = require('../../../lib/image-stream/utils'); +const tester = require('../tester'); const ZIP_PATH = path.join(__dirname, '..', 'data', 'zip'); describe('ImageStream: Archive hooks: ZIP', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getEntries()', function() { diff --git a/tests/image-stream/bz2.spec.js b/tests/image-stream/bz2.spec.js index e0ca4828..99f5fd1e 100644 --- a/tests/image-stream/bz2.spec.js +++ b/tests/image-stream/bz2.spec.js @@ -27,7 +27,7 @@ const tester = require('./tester'); describe('ImageStream: BZ2', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('compression method', function() { diff --git a/tests/image-stream/dmg.spec.js b/tests/image-stream/dmg.spec.js index feaa72fe..1b52283f 100644 --- a/tests/image-stream/dmg.spec.js +++ b/tests/image-stream/dmg.spec.js @@ -27,7 +27,7 @@ const tester = require('./tester'); describe('ImageStream: DMG', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('compression method', function() { diff --git a/tests/image-stream/gz.spec.js b/tests/image-stream/gz.spec.js index 0d950bfa..f934327b 100644 --- a/tests/image-stream/gz.spec.js +++ b/tests/image-stream/gz.spec.js @@ -27,7 +27,7 @@ const tester = require('./tester'); describe('ImageStream: GZ', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getFromFilePath()', function() { diff --git a/tests/image-stream/img.spec.js b/tests/image-stream/img.spec.js index 8823fc97..1015e3fc 100644 --- a/tests/image-stream/img.spec.js +++ b/tests/image-stream/img.spec.js @@ -26,7 +26,7 @@ const tester = require('./tester'); describe('ImageStream: IMG', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getFromFilePath()', function() { diff --git a/tests/image-stream/iso.spec.js b/tests/image-stream/iso.spec.js index d1d1a8da..ae7c888e 100644 --- a/tests/image-stream/iso.spec.js +++ b/tests/image-stream/iso.spec.js @@ -26,7 +26,7 @@ const tester = require('./tester'); describe('ImageStream: ISO', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getFromFilePath()', function() { diff --git a/tests/image-stream/tester.js b/tests/image-stream/tester.js index ff5ddb80..64ee1428 100644 --- a/tests/image-stream/tester.js +++ b/tests/image-stream/tester.js @@ -43,6 +43,8 @@ const deleteIfExists = (file) => { }); }; +exports.DEFAULT_IMAGE_TESTS_TIMEOUT = 20000; + exports.expectError = function(file, errorMessage, errorDetail) { it('should be rejected with an error', function() { return imageStream.getFromFilePath(file).catch((error) => { diff --git a/tests/image-stream/xz.spec.js b/tests/image-stream/xz.spec.js index 4de46f9f..962681b4 100644 --- a/tests/image-stream/xz.spec.js +++ b/tests/image-stream/xz.spec.js @@ -27,7 +27,7 @@ const tester = require('./tester'); describe('ImageStream: XZ', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getFromFilePath()', function() { diff --git a/tests/image-stream/zip.spec.js b/tests/image-stream/zip.spec.js index 2621246e..58eb2984 100644 --- a/tests/image-stream/zip.spec.js +++ b/tests/image-stream/zip.spec.js @@ -27,7 +27,7 @@ const tester = require('./tester'); describe('ImageStream: ZIP', function() { - this.timeout(20000); + this.timeout(tester.DEFAULT_IMAGE_TESTS_TIMEOUT); describe('.getFromFilePath()', function() {