JS Tests: Fallback to config-example if config is not present.

This commit is contained in:
Stefan Thomas
2013-07-27 19:47:51 -07:00
parent 1d5802fd1c
commit ccde264282
10 changed files with 31 additions and 21 deletions

View File

@@ -7,8 +7,7 @@ var Request = require("ripple-lib").Request;
var Server = require("./server").Server;
var testutils = require("./testutils");
var config = require('ripple-lib').config.load(require('./config'));
var config = testutils.init_config();
// How long to wait for server to start.
var serverDelay = 1500;

View File

@@ -6,9 +6,8 @@ var Remote = require("ripple-lib").Remote;
var Transaction = require("ripple-lib").Transaction;
var Server = require("./server").Server;
var testutils = require("./testutils");
require('ripple-lib').config.load(require('./config'));
var testutils = require("./testutils");
var config = testutils.init_config();
buster.testRunner.timeout = 350000; //This is a very long test!

View File

@@ -10,7 +10,7 @@ var Server = require("./server").Server;
var testutils = require("./testutils");
var config = require('ripple-lib').config.load(require('./config'));
var config = testutils.init_config();
// How long to wait for server to start.
var serverDelay = 1500;

View File

@@ -6,8 +6,7 @@ var Remote = require("ripple-lib").Remote;
var Server = require("./server").Server;
var testutils = require("./testutils");
require('ripple-lib').config.load(require('./config'));
var config = testutils.init_config();
buster.testRunner.timeout = 5000;

View File

@@ -7,9 +7,8 @@ var Remote = require("ripple-lib").Remote;
var Transaction = require("ripple-lib").Transaction;
var Server = require("./server").Server;
var testutils = require("./testutils");
require('ripple-lib').config.load(require('./config'));
var testutils = require("./testutils");
var config = testutils.init_config();
buster.testRunner.timeout = 5000;

View File

@@ -6,9 +6,9 @@ var Remote = require("ripple-lib").Remote;
var Transaction = require("ripple-lib").Transaction;
var Server = require("./server").Server;
var testutils = require("./testutils");
var testutils = require("./testutils");
var config = testutils.init_config();
require('ripple-lib').config.load(require('./config'));
buster.testRunner.timeout = 5000;

View File

@@ -5,8 +5,7 @@ var Remote = require("ripple-lib").Remote;
var Server = require("./server.js").Server;
var testutils = require("./testutils.js");
var config = require('ripple-lib').config.load(require('./config'));
var config = testutils.init_config();
// How long to wait for server to start.
var serverDelay = 1500; // XXX Not implemented.

View File

@@ -6,8 +6,7 @@ var Remote = require("ripple-lib").Remote;
var Server = require("./server").Server;
var testutils = require("./testutils");
var config = require('ripple-lib').config.load(require('./config'));
var config = testutils.init_config();
// How long to wait for server to start.
var serverDelay = 1500;

View File

@@ -218,6 +218,20 @@ var credit_limit = function (remote, src, amount, callback) {
}
};
function init_config() {
var cfg;
// See if the person testing wants to override the configuration by creating a
// file called test/config.js.
try {
cfg = require('./config');
} catch (e) {
cfg = require('./config-example');
}
return require('ripple-lib').config.load(cfg);
}
var verify_limit = function (remote, src, amount, callback) {
assert(4 === arguments.length);
@@ -486,6 +500,7 @@ exports.build_teardown = build_teardown;
exports.create_accounts = create_accounts;
exports.credit_limit = credit_limit;
exports.credit_limits = credit_limits;
exports.init_config = init_config;
exports.ledger_close = ledger_close;
exports.payment = payment;
exports.payments = payments;

View File

@@ -1,9 +1,10 @@
var buster = require("buster");
var buster = require("buster");
var Server = require("./server").Server;
var Remote = require("ripple-lib").Remote;
var Server = require("./server").Server;
var Remote = require("ripple-lib").Remote;
var config = require('ripple-lib').config.load(require('./config'));
var testutils = require('./testutils');
var config = testutils.init_config();
buster.testRunner.timeout = 5000;