From 56a7e48cd98cce586ea2bc8c5a118e86b285bed3 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Tue, 16 Oct 2012 20:32:40 -0700
Subject: [PATCH] UT: Allow tests to use existing server.

---
 test/config.js |  4 ++--
 test/server.js | 36 +++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/test/config.js b/test/config.js
index dcafa641f4..6d448ae172 100644
--- a/test/config.js
+++ b/test/config.js
@@ -18,8 +18,8 @@ exports.servers = {
     'rpc_port' : 5005,
     'websocket_ip' : "127.0.0.1",
     'websocket_port' : 6005,
-    'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h",
-    'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta"
+    // 'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h",
+    // 'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta"
   }
 };
 
diff --git a/test/server.js b/test/server.js
index be6d8e7be2..85efe695b9 100644
--- a/test/server.js
+++ b/test/server.js
@@ -19,8 +19,9 @@ var child     = require("child_process");
 var servers = {};
 
 // Create a server object
-var Server = function (name) {
+var Server = function (name, mock) {
   this.name = name;
+  this.mock = mock;
 };
 
 // Return a server's rippled.cfg as string.
@@ -92,20 +93,29 @@ Server.prototype.makeBase = function (done) {
 Server.prototype.start = function (done) {
   var self	= this;
 
-  this.makeBase(function (e) {
-      if (e) {
-	throw e;
-      }
-      else {
-	self.serverSpawnSync();
-	done();
-      }
-    });
+  if (this.mock) {
+    done();
+  }
+  else {
+    this.makeBase(function (e) {
+	if (e) {
+	  throw e;
+	}
+	else {
+	  self.serverSpawnSync();
+	  done();
+	}
+      });
+  }
 };
 
 // Stop a standalone server.
 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.
     this.child.on('exit', function (code, signal) {
 	console.log("server: stop: server exited");
@@ -121,14 +131,14 @@ Server.prototype.stop = function (done) {
 };
 
 // Start the named server.
-exports.start = function (name, done) {
+exports.start = function (name, done, mock) {
   if (servers[name])
   {
     console.log("server: start: server already started.");
   }
   else
   {
-    var server = new Server(name);
+    var server = new Server(name, mock);
 
     servers[name] = server;