From 0dc304b37b3a7888c93c4bc03ed7cd4e5a89e39e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 18 Jun 2015 17:30:08 -0700 Subject: [PATCH] Properly set timeout for integration tests --- __integration__/HubUtil-integration.js | 20 +++++++++++--------- __integration__/RegHubUtil-integration.js | 4 +--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/__integration__/HubUtil-integration.js b/__integration__/HubUtil-integration.js index cdde6a0c6d..aea18ca4c7 100644 --- a/__integration__/HubUtil-integration.js +++ b/__integration__/HubUtil-integration.js @@ -1,22 +1,24 @@ jest.autoMockOff(); +jasmine.getEnv().defaultTimeoutInterval = 60000; + let hubUtil = require('../src/utils/HubUtil'); let Promise = require('bluebird'); -jasmine.getEnv().DEFAULT_TIMEOUT_INTERVAL = 60000; - describe('HubUtil Integration Tests', () => { describe('auth', () => { pit('successfully authenticates', () => { return new Promise((resolve) => { - hubUtil.auth(process.env.INTEGRATION_USER, process.env.INTEGRATION_PASSWORD, (error, response, body) => { - expect(response.statusCode).toBe(200); - expect(error).toBe(null); + setTimeout(() => { + hubUtil.auth(process.env.INTEGRATION_USER, process.env.INTEGRATION_PASSWORD, (error, response, body) => { + expect(response.statusCode).toBe(200); + expect(error).toBe(null); - let data = JSON.parse(body); - expect(data.token).toBeTruthy(); - resolve(); - }); + let data = JSON.parse(body); + expect(data.token).toBeTruthy(); + resolve(); + }); + }, 5000); }); }); diff --git a/__integration__/RegHubUtil-integration.js b/__integration__/RegHubUtil-integration.js index ec239f3f2a..a0876bcfde 100644 --- a/__integration__/RegHubUtil-integration.js +++ b/__integration__/RegHubUtil-integration.js @@ -1,7 +1,6 @@ jest.autoMockOff(); -// One minute timeout for integration tests -jasmine.getEnv().DEFAULT_TIMEOUT_INTERVAL = 60000; +jasmine.getEnv().defaultTimeoutInterval = 60000; let _ = require('underscore'); let regHubUtil = require('../src/utils/RegHubUtil'); @@ -51,7 +50,6 @@ describe('RegHubUtil Integration Tests', () => { return new Promise((resolve) => { hubUtil.login(process.env.INTEGRATION_USER, process.env.INTEGRATION_PASSWORD, () => { regHubUtil.tags(`${process.env.INTEGRATION_USER}/test`, (error, tags) => { - console.log(tags); expect(error).toBeFalsy(); expect(tags.length).toEqual(1); expect(tags[0].name).toEqual('latest');