couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [23/35] couchdb commit: updated refs/heads/2876-js-tests-merged to 6d9b2eb
Date Sat, 12 Dec 2015 16:01:44 GMT
since in replication


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

Branch: refs/heads/2876-js-tests-merged
Commit: 5a2e9bc61365d9e2583d4b4eef4bebe45f171756
Parents: 2e011d4
Author: sebastianro <sebastianro@apache.org>
Authored: Tue Nov 10 21:59:30 2015 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Sat Dec 12 15:25:10 2015 +0100

----------------------------------------------------------------------
 test/javascript/tests/replication.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a2e9bc6/test/javascript/tests/replication.js
----------------------------------------------------------------------
diff --git a/test/javascript/tests/replication.js b/test/javascript/tests/replication.js
index 0e80035..ec8825e 100644
--- a/test/javascript/tests/replication.js
+++ b/test/javascript/tests/replication.js
@@ -543,12 +543,13 @@ couchTests.replication = function(debug) {
   docs = makeDocs(1, 6);
 
   for (i = 0; i < dbPairs.length; i++) {
-    var since_seq = 3;
     populateDb(sourceDb, docs);
     populateDb(targetDb, []);
+    // sequences are no longer simple numbers - so pull #3 from a feed
+    var since_seq = sourceDb.changes().results[2].seq;
 
     var expected_ids = [];
-    var changes = sourceDb.changes({since: since_seq});
+    var changes = sourceDb.changes({since: JSON.stringify(since_seq)});
     for (j = 0; j < changes.results.length; j++) {
       expected_ids.push(changes.results[j].id);
     }
@@ -566,7 +567,7 @@ couchTests.replication = function(debug) {
       );
     } catch (x) {
       // OTP R14B03 onwards
-      TEquals("not found", x.error);
+      TEquals("not_found", x.error);
     }
     repResult = CouchDB.replicate(
       dbPairs[i].source,
@@ -584,7 +585,7 @@ couchTests.replication = function(debug) {
       );
     } catch (x) {
       // OTP R14B03 onwards
-      TEquals("not found", x.error);
+      TEquals("not_found", x.error);
     }
     TEquals(true, repResult.ok);
     TEquals(2, repResult.history[0].missing_checked);


Mime
View raw message