Shutdown rippled before http server in json rpc test to avoid http server potentially receiving messages due to automatic ledger close interval.

This commit is contained in:
Nicholas Dudfield
2014-02-04 11:00:58 +07:00
committed by Vinnie Falco
parent 123c482a69
commit 83442825e5
2 changed files with 9 additions and 6 deletions

View File

@@ -50,10 +50,10 @@ function build_teardown() {
return function (done) { return function (done) {
var self = this; var self = this;
teardown.call(self, function () {
self.server.close(function () { self.server.close(function () {
// console.log("server closed"); done();
});
teardown.call(self, done);
}); });
}; };
}; };

View File

@@ -140,9 +140,12 @@ function build_setup(opts, host) {
}, },
function create_ledger_interval(callback) { function create_ledger_interval(callback) {
if (opts.no_auto_ledger_close) {return callback(); };
self.ledger_interval = setInterval(function() { self.ledger_interval = setInterval(function() {
self.remote.ledger_accept(); self.remote.ledger_accept();
}, 200); }, 200);
callback(); callback();
} }
@@ -170,7 +173,7 @@ function build_teardown(host) {
var series = [ var series = [
function clear_ledger_interval(callback) { function clear_ledger_interval(callback) {
clearInterval(self.ledger_interval); if (self.ledger_interval != null) {clearInterval(self.ledger_interval)};
callback(); callback();
}, },