From b1e79d163abad3bed7a72835e4cd3fd73b4d9e95 Mon Sep 17 00:00:00 2001
From: Zachary Carter <zack.carter@gmail.com>
Date: Mon, 24 Sep 2012 18:39:16 -0700
Subject: [PATCH] Clean up some dead code in
---
tests/db-test.js | 1 -
tests/lib/start-stop.js | 16 +++-------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/tests/db-test.js b/tests/db-test.js
index 811f5cfb6..96753ebdf 100755
--- a/tests/db-test.js
+++ b/tests/db-test.js
@@ -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": {
diff --git a/tests/lib/start-stop.js b/tests/lib/start-stop.js
index 742fb0327..49764616b 100644
--- a/tests/lib/start-stop.js
+++ b/tests/lib/start-stop.js
@@ -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) {
}
}
});
-}
+};
--
GitLab