You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2015/12/16 22:15:40 UTC

[39/50] couchdb commit: updated refs/heads/master to e8e03b6

JS test: update view_conflicts.js for 2.0


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bb5d6258
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bb5d6258
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bb5d6258

Branch: refs/heads/master
Commit: bb5d62586b2ad245687afbad245a5a2f7f5ca458
Parents: 388e861
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Dec 16 20:49:34 2015 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Dec 16 20:49:34 2015 +0100

----------------------------------------------------------------------
 test/javascript/tests/view_conflicts.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb5d6258/test/javascript/tests/view_conflicts.js
----------------------------------------------------------------------
diff --git a/test/javascript/tests/view_conflicts.js b/test/javascript/tests/view_conflicts.js
index 96f97d5..b1c938c 100644
--- a/test/javascript/tests/view_conflicts.js
+++ b/test/javascript/tests/view_conflicts.js
@@ -11,11 +11,14 @@
 // the License.
 
 couchTests.view_conflicts = function(debug) {
-  var dbA = new CouchDB("test_suite_db_a", {"X-Couch-Full-Commit":"false"});
-  dbA.deleteDb();
+
+  var db_name_a = get_random_db_name();
+  var dbA = new CouchDB(db_name_a, {"X-Couch-Full-Commit":"false"});
+
+  var db_name_b = get_random_db_name();
+  var dbB = new CouchDB(db_name_b, {"X-Couch-Full-Commit":"false"});
+
   dbA.createDb();
-  var dbB = new CouchDB("test_suite_db_b", {"X-Couch-Full-Commit":"false"});
-  dbB.deleteDb();
   dbB.createDb();
   if (debug) debugger;
 
@@ -46,4 +49,8 @@ couchTests.view_conflicts = function(debug) {
     }
   });
   T(results.rows[0].value[0] == conflictRev);
+
+  // cleanup
+  dbA.deleteDb();
+  dbB.deleteDb();
 };