Skip to content
Snippets Groups Projects
Commit bb0b41e5 authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge pull request #2523 from zaach/remove_dead_test_code

Clean up dead code in `tests/`

r+

Thanks for the cleanup @zaach!
parents 536ccde1 b1e79d16
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,6 @@ var suite = vows.describe('db');
suite.options.error = false;
var dbCfg = configuration.get('database');
dbCfg.drop_on_close = true;
suite.addBatch({
"onReady": {
......
......@@ -69,15 +69,6 @@ function setupProc(proc) {
});
}
function removeVarDir() {
try {
fs.readdirSync(varPath).forEach(function(f) {
fs.unlinkSync(path.join(varPath, f));
});
fs.rmdirSync(varPath);
} catch(e) {}
}
exports.addStartupBatches = function(suite) {
// disable vows (often flakey?) async error behavior
......@@ -104,7 +95,6 @@ exports.addStartupBatches = function(suite) {
"opening the database": {
topic: function() {
var cfg = config.get('database');
cfg.drop_on_close = true;
db.open(cfg, this.callback);
},
"should work fine": function(r) {
......@@ -117,7 +107,7 @@ exports.addStartupBatches = function(suite) {
"run the server": {
topic: function() {
var pathToHarness = path.join(__dirname, '..', '..', 'scripts', 'run_locally.js');
proc = spawn('node', [ pathToHarness ])
proc = spawn('node', [ pathToHarness ]);
setupProc(proc);
exports.browserid.on('ready', this.callback);
},
......@@ -151,7 +141,7 @@ exports.addRestartBatch = function(suite) {
"run the server": {
topic: function() {
var pathToHarness = path.join(__dirname, '..', '..', 'scripts', 'run_locally.js');
proc = spawn('node', [ pathToHarness ])
proc = spawn('node', [ pathToHarness ]);
setupProc(proc);
exports.browserid.on('ready', this.callback);
},
......@@ -193,4 +183,4 @@ exports.addShutdownBatches = function(suite) {
}
}
});
}
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment