UT: Allow tests to use existing server.

This commit is contained in:
Arthur Britto
2012-10-16 20:32:40 -07:00
parent a568f6ff26
commit 56a7e48cd9
2 changed files with 25 additions and 15 deletions

View File

@@ -18,8 +18,8 @@ exports.servers = {
'rpc_port' : 5005, 'rpc_port' : 5005,
'websocket_ip' : "127.0.0.1", 'websocket_ip' : "127.0.0.1",
'websocket_port' : 6005, 'websocket_port' : 6005,
'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h", // 'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h",
'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta" // 'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta"
} }
}; };

View File

@@ -19,8 +19,9 @@ var child = require("child_process");
var servers = {}; var servers = {};
// Create a server object // Create a server object
var Server = function (name) { var Server = function (name, mock) {
this.name = name; this.name = name;
this.mock = mock;
}; };
// Return a server's rippled.cfg as string. // Return a server's rippled.cfg as string.
@@ -92,6 +93,10 @@ Server.prototype.makeBase = function (done) {
Server.prototype.start = function (done) { Server.prototype.start = function (done) {
var self = this; var self = this;
if (this.mock) {
done();
}
else {
this.makeBase(function (e) { this.makeBase(function (e) {
if (e) { if (e) {
throw e; throw e;
@@ -101,11 +106,16 @@ Server.prototype.start = function (done) {
done(); done();
} }
}); });
}
}; };
// Stop a standalone server. // Stop a standalone server.
Server.prototype.stop = function (done) { Server.prototype.stop = function (done) {
if (this.child) { if (this.mock) {
console.log("server: stop: mock");
done();
}
else if (this.child) {
// Update the on exit to invoke done. // Update the on exit to invoke done.
this.child.on('exit', function (code, signal) { this.child.on('exit', function (code, signal) {
console.log("server: stop: server exited"); console.log("server: stop: server exited");
@@ -121,14 +131,14 @@ Server.prototype.stop = function (done) {
}; };
// Start the named server. // Start the named server.
exports.start = function (name, done) { exports.start = function (name, done, mock) {
if (servers[name]) if (servers[name])
{ {
console.log("server: start: server already started."); console.log("server: start: server already started.");
} }
else else
{ {
var server = new Server(name); var server = new Server(name, mock);
servers[name] = server; servers[name] = server;