(456) - Cleanup during test runs

mikeal · Mar 30, 2013 · 861bd19 · 861bd19
1 parent 22b5ac1
commit 861bd19
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 88 deletions.
diff --git a/tests/test.all_docs.js b/tests/test.all_docs.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true, makeDocs: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -26,12 +27,9 @@ adapters.map(function(adapter) {
   qunit('all_docs: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var origDocs = [

diff --git a/tests/test.attachments.js b/tests/test.attachments.js
@@ -2,6 +2,7 @@
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true, makeDocs: false */
 /*globals readBlob: false, makeBlob: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -30,12 +31,9 @@ adapters.map(function(adapter) {
   qunit('attachments: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var binAttDoc = {

diff --git a/tests/test.basics.js b/tests/test.basics.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -24,12 +25,9 @@ adapters.map(function(adapter) {
   qunit("basics: " + adapter, {
     setup: function() {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest("Create a pouch", 1, function() {
@@ -60,7 +58,6 @@ adapters.map(function(adapter) {
   });
 
   asyncTest("Modify a doc", 3, function() {
-    console.info('testing: Modify a doc');
     initTestDB(this.name, function(err, db) {
       ok(!err, 'opened the pouch');
       db.post({test: "somestuff"}, function (err, info) {

diff --git a/tests/test.bulk_docs.js b/tests/test.bulk_docs.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true, makeDocs: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -27,12 +28,9 @@ adapters.map(function(adapter) {
   qunit('bulk_docs: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var authors = [

diff --git a/tests/test.changes.js b/tests/test.changes.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -26,12 +27,9 @@ adapters.map(function(adapter) {
   QUnit.module("changes: " + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest("All changes", function () {

diff --git a/tests/test.compaction.js b/tests/test.compaction.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true, putTree: false */
 /*globals ajax: true, LevelPouch: true, makeDocs: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -25,12 +26,9 @@ adapters.map(function(adapter) {
   qunit('compaction: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest('Compation document with no revisions to remove', function() {

diff --git a/tests/test.conflicts.js b/tests/test.conflicts.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -26,12 +27,9 @@ adapters.map(function(adapter) {
   qunit('conflicts: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest('Testing conflicts', function() {

diff --git a/tests/test.design_docs.js b/tests/test.design_docs.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -26,12 +27,9 @@ adapters.map(function(adapter) {
   qunit("design_docs: " + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var doc = {

diff --git a/tests/test.get.js b/tests/test.get.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false, putTree: false, putBranch: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true, makeDocs: false, strictEqual: false, notStrictEqual: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -26,12 +27,9 @@ adapters.map(function(adapter) {
   qunit('get: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var origDocs = [

diff --git a/tests/test.gql.js b/tests/test.gql.js
@@ -1,5 +1,6 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -23,12 +24,9 @@ adapters.map(function(adapter) {
   qunit('gql: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest("Test select *", function() {

diff --git a/tests/test.issue221.js b/tests/test.issue221.js
@@ -1,6 +1,7 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false, strictEqual: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -30,13 +31,9 @@ adapters.map(function(adapters) {
     setup: function() {
       this.local = generateAdapterUrl(adapters[0]);
       this.remote = generateAdapterUrl(adapters[1]);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.local);
-        Pouch.destroy(this.remote);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var doc = { _id: '0', integer: 0 };

diff --git a/tests/test.replication.js b/tests/test.replication.js
@@ -1,5 +1,6 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, initDBPair: false, openTestDB: false, putAfter: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -33,13 +34,9 @@ adapters.map(function(adapters) {
     setup : function () {
       this.name = generateAdapterUrl(adapters[0]);
       this.remote = generateAdapterUrl(adapters[1]);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-        Pouch.destroy(this.remote);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   var docs = [

diff --git a/tests/test.revs_diff.js b/tests/test.revs_diff.js
@@ -1,10 +1,12 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
 var adapters = ['http-1', 'local-1'];
 var qunit = module;
+var LevelPouch;
 
 // if we are running under node.js, set things up
 // a little differently, and only test the leveldb adapter
@@ -24,12 +26,9 @@ adapters.map(function(adapter) {
   qunit("revs diff:" + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest("Test revs diff", function() {

diff --git a/tests/test.spatial.js b/tests/test.spatial.js
@@ -1,10 +1,12 @@
 /*globals initTestDB: false, emit: true, generateAdapterUrl: false */
 /*globals PERSIST_DATABASES: false, Spatial: false */
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
 var adapters = ['local-1', 'http-1'];
 var qunit = module;
+var LevelPouch;
 
 // if we are running under node.js, set things up
 // a little differently, and only test the leveldb adapter
@@ -24,12 +26,9 @@ adapters.map(function(adapter) {
   qunit('spatial: ' + adapter, {
     setup : function () {
       this.name = generateAdapterUrl(adapter);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   // some geometries are based on the GeoJSON specification

diff --git a/tests/test.taskqueue.js b/tests/test.taskqueue.js
@@ -2,6 +2,7 @@
 /*globals PERSIST_DATABASES: false, initDBPair: false, utils: true */
 /*globals ajax: true, LevelPouch: true */
 /*globals Pouch: true, QUnit, uuid, asyncTest, ok, start*/
+/*globals cleanupTestDatabases: false */
 
 "use strict";
 
@@ -24,13 +25,9 @@ adapters.map(function(adapter) {
   qunit("taskqueue: " + adapter, {
     setup: function() {
       this.name = generateAdapterUrl(adapter);
-      Pouch.destroy(this.name);
+      Pouch.enableAllDbs = true;
     },
-    teardown: function() {
-      if (!PERSIST_DATABASES) {
-        Pouch.destroy(this.name);
-      }
-    }
+    teardown: cleanupTestDatabases
   });
 
   asyncTest("Add a doc", 1, function() {