From 3b85fe394c0828b73f8aac9ac1bad6cbd6d3bddb Mon Sep 17 00:00:00 2001
From: Nicholas Dudfield <ndudfield@gmail.com>
Date: Tue, 4 Feb 2014 11:00:58 +0700
Subject: [PATCH] Shutdown rippled before http server in json rpc test to avoid
 http server potentially receiving messages due to automatic ledger close
 interval.

---
 test/jsonrpc-test.js | 8 ++++----
 test/testutils.js    | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/jsonrpc-test.js b/test/jsonrpc-test.js
index abd6922a5f3..5660154c0c0 100644
--- a/test/jsonrpc-test.js
+++ b/test/jsonrpc-test.js
@@ -50,10 +50,10 @@ function build_teardown() {
   return function (done) {
     var self  = this;
 
-    self.server.close(function () {
-      // console.log("server closed");
-
-      teardown.call(self, done);
+    teardown.call(self, function () {
+      self.server.close(function () {
+        done();
+      });
     });
   };
 };
diff --git a/test/testutils.js b/test/testutils.js
index 53e634f7e0f..7e792eae9ed 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -140,9 +140,12 @@ function build_setup(opts, host) {
       },
 
       function create_ledger_interval(callback) {
+        if (opts.no_auto_ledger_close) {return callback(); };
+
         self.ledger_interval = setInterval(function() {
           self.remote.ledger_accept();
-        }, 200);
+        }, 200);  
+
         callback();
       }
 
@@ -170,7 +173,7 @@ function build_teardown(host) {
 
     var series = [
       function clear_ledger_interval(callback) {
-        clearInterval(self.ledger_interval);
+        if (self.ledger_interval != null) {clearInterval(self.ledger_interval)};
         callback();
       },