Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0444510365 for ; Sat, 12 Dec 2015 16:01:26 +0000 (UTC) Received: (qmail 61180 invoked by uid 500); 12 Dec 2015 16:01:23 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 60983 invoked by uid 500); 12 Dec 2015 16:01:23 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 60240 invoked by uid 99); 12 Dec 2015 16:01:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Dec 2015 16:01:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2AEBDDFFB9; Sat, 12 Dec 2015 16:01:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Sat, 12 Dec 2015 16:01:44 -0000 Message-Id: <76b2249c27204c38b1ae31929e0a794c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/35] couchdb commit: updated refs/heads/2876-js-tests-merged to 6d9b2eb 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 Authored: Tue Nov 10 21:59:30 2015 +0100 Committer: Jan Lehnardt 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);