From c25f5c5bc7a16c0054d213c2b2a6d35f05fc6dbf Mon Sep 17 00:00:00 2001 From: Eric Satterwhite Date: Fri, 2 Jun 2017 21:10:18 -0500 Subject: [PATCH] run tests on a single instance. hard to control across many hosts --- .travis.yml | 9 ++++++--- test/integration/delete-timer.spec.js | 4 +++- test/integration/post-timer.spec.js | 4 +++- test/integration/put-timer.spec.js | 2 +- test/{ => unit}/server.spec.js | 2 +- test/{ => unit}/timer.spec.js | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) rename test/{ => unit}/server.spec.js (98%) rename test/{ => unit}/timer.spec.js (98%) diff --git a/.travis.yml b/.travis.yml index 986bc6ca..e187f4d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,18 @@ sudo: required services: - docker -script: npm run test:ci +script: npm test language: node_js -after_install: - - docker-compose -f compose/test.yml down +before_script: + - docker-compose -f compose/nats.yml up -d +after_script: + - docker-compose -f compose/nats.yml down git: depth: 3 node_js: - "6" - "7" + - "8" addons: code_climate: repo_token: 248135f96061f77d2e5f78526432fd096785d2914d8f5a73a04c061000939d5d diff --git a/test/integration/delete-timer.spec.js b/test/integration/delete-timer.spec.js index bb016fcd..b9f790d3 100644 --- a/test/integration/delete-timer.spec.js +++ b/test/integration/delete-timer.spec.js @@ -20,7 +20,9 @@ if (!process.env.TEST_HOST) { test('skyring:api', (t) => { let server, request; t.test('set up skyring server', (tt) => { - server = new Server(); + server = new Server({ + seeds: [`${hostname}:3455`] + }); request = supertest('http://localhost:4444') server.load().listen(4444, null, null, tt.end); }); diff --git a/test/integration/post-timer.spec.js b/test/integration/post-timer.spec.js index 6c3a42cc..809c90b1 100644 --- a/test/integration/post-timer.spec.js +++ b/test/integration/post-timer.spec.js @@ -45,7 +45,9 @@ function toServer(port, expect = 'hello', method = 'post', time = 1000, t){ test('skyring:api', (t) => { let request, server t.test('setup skyring server', (tt) => { - server = new Server(); + server = new Server({ + seeds: [`${hostname}:3455`] + }); request = supertest('http://localhost:3333'); server.load().listen(3333, null, null, tt.end) }); diff --git a/test/integration/put-timer.spec.js b/test/integration/put-timer.spec.js index f67ca762..e567a903 100644 --- a/test/integration/put-timer.spec.js +++ b/test/integration/put-timer.spec.js @@ -20,7 +20,7 @@ if(!process.env.TEST_HOST) { test('skyring:api', (t) => { let server, request; t.test('set up ring server', ( tt ) => { - server = new Server(); + server = new Server({ seeds: [`${hostname}:3455`] }); request = supertest('http://localhost:5544'); server.load().listen(5544, null, null, tt.end); }); diff --git a/test/server.spec.js b/test/unit/server.spec.js similarity index 98% rename from test/server.spec.js rename to test/unit/server.spec.js index a02c36c1..c3634e45 100644 --- a/test/server.spec.js +++ b/test/unit/server.spec.js @@ -8,7 +8,7 @@ const crypto = require('crypto') , async = require('async') , conf = require('keef') , tap = require('tap') - , Server = require('../lib/server') + , Server = require('../../lib/server') , test = tap.test diff --git a/test/timer.spec.js b/test/unit/timer.spec.js similarity index 98% rename from test/timer.spec.js rename to test/unit/timer.spec.js index be30b986..72c625ca 100644 --- a/test/timer.spec.js +++ b/test/unit/timer.spec.js @@ -6,7 +6,7 @@ const os = require('os') , tap = require('tap') , uuid = require('uuid') , conf = require('keef') - , Timer = require('../lib/timer') + , Timer = require('../../lib/timer') , test = tap.test ;