Skip to content
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

Moved the check for keystone readiness for e2e to kne. #4003

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved the check for keystone readiness for e2e to kne. #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
"react-engine": "4.2.1",
"rimraf": "2.5.4",
"sinon": "1.17.7",
"superagent": "3.4.1",
"supertest": "3.0.0",
"uglify-js": "2.7.5",
"updtr": "0.2.3",
Expand Down
26 changes: 0 additions & 26 deletions test/e2e/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ var async = require('async');
var keystone = require('../..');
var ReactEngine = require('react-engine');
var engine = ReactEngine.server.create({});
var request = require('superagent');
var moment = require('moment');
var mongoose = require('mongoose');
var path = require('path');
Expand Down Expand Up @@ -37,27 +36,6 @@ function dropTestDatabase(done) {
});
}

// Function that checks if keystone is ready before starting testing
function checkKeystoneReady (done) {
async.retry({
times: 10,
interval: 3000
}, function(done, result) {
console.log([moment().format('HH:mm:ss:SSS')] + ' e2e: checking if KeystoneJS ready for request');
request
.get('http://' + keystone.get('host') + ':' + keystone.get('port') + '/keystone')
.end(done);
}, function (err, result) {
if (!err) {
console.log([moment().format('HH:mm:ss:SSS')] + ' e2e: KeystoneJS Ready!');
done();
} else {
console.log([moment().format('HH:mm:ss:SSS')] + ' e2e: KeystoneJS does not appear ready!');
done(err);
}
})
}

// Function that starts the e2e common framework
function runE2E (options, done) {
console.log([moment().format('HH:mm:ss:SSS')] + ' e2e: starting tests...');
Expand Down Expand Up @@ -176,10 +154,6 @@ function start() {
runKeystone(cb);
},

function (cb) {
checkKeystoneReady(cb);
},

function (cb) {
if (runTests) {
runE2E({
Expand Down