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 77AB79D3B for ; Sat, 7 Jan 2012 13:14:07 +0000 (UTC) Received: (qmail 70142 invoked by uid 500); 7 Jan 2012 13:14:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 69893 invoked by uid 500); 7 Jan 2012 13:13:59 -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 69742 invoked by uid 99); 7 Jan 2012 13:13:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2012 13:13:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2012 13:13:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E5F015349B; Sat, 7 Jan 2012 13:13:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Fix check of conflicts for replication tests Message-Id: <20120107131319.E5F015349B@tyr.zones.apache.org> Date: Sat, 7 Jan 2012 13:13:19 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 1054f9493 -> 975ea08c7 Fix check of conflicts for replication tests The conflicts option belongs to couch_db:open_doc/3 and not to couch_doc:to_json_obj/2. Also added the deleted_conflicts option. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b64643a3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b64643a3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b64643a3 Branch: refs/heads/master Commit: b64643a3ee4a3148f9d70fa38ea5a8b0e55650a1 Parents: 1054f94 Author: Filipe David Borba Manana Authored: Sat Jan 7 12:44:16 2012 +0000 Committer: Filipe David Borba Manana Committed: Sat Jan 7 12:46:04 2012 +0000 ---------------------------------------------------------------------- .../test/05-replication-many-leaves.t | 8 ++++---- src/couch_replicator/test/06-doc-missing-stubs.t | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b64643a3/src/couch_replicator/test/05-replication-many-leaves.t ---------------------------------------------------------------------- diff --git a/src/couch_replicator/test/05-replication-many-leaves.t b/src/couch_replicator/test/05-replication-many-leaves.t index 22c7df8..d8d3eb9 100755 --- a/src/couch_replicator/test/05-replication-many-leaves.t +++ b/src/couch_replicator/test/05-replication-many-leaves.t @@ -170,13 +170,13 @@ verify_target(SourceDb, TargetDb, [{DocId, RevList} | Rest]) -> TargetDb, DocId, RevList, - []), + [conflicts, deleted_conflicts]), Docs = [Doc || {ok, Doc} <- Lookups], {ok, SourceLookups} = couch_db:open_doc_revs( SourceDb, DocId, RevList, - []), + [conflicts, deleted_conflicts]), SourceDocs = [Doc || {ok, Doc} <- SourceLookups], Total = doc_num_conflicts(DocId) + 1, etap:is( @@ -186,8 +186,8 @@ verify_target(SourceDb, TargetDb, [{DocId, RevList} | Rest]) -> etap:diag("Verifying all revisions of document " ++ ?b2l(DocId)), lists:foreach( fun({#doc{id = Id, revs = Revs} = TgtDoc, #doc{id = Id, revs = Revs} = SrcDoc}) -> - SourceJson = couch_doc:to_json_obj(SrcDoc, [attachments, conflicts]), - TargetJson = couch_doc:to_json_obj(TgtDoc, [attachments, conflicts]), + SourceJson = couch_doc:to_json_obj(SrcDoc, [attachments]), + TargetJson = couch_doc:to_json_obj(TgtDoc, [attachments]), case TargetJson of SourceJson -> ok; http://git-wip-us.apache.org/repos/asf/couchdb/blob/b64643a3/src/couch_replicator/test/06-doc-missing-stubs.t ---------------------------------------------------------------------- diff --git a/src/couch_replicator/test/06-doc-missing-stubs.t b/src/couch_replicator/test/06-doc-missing-stubs.t index 04ec021..e17efc9 100755 --- a/src/couch_replicator/test/06-doc-missing-stubs.t +++ b/src/couch_replicator/test/06-doc-missing-stubs.t @@ -163,18 +163,20 @@ compare_dbs(Source, Target) -> {ok, TargetDb} = couch_db:open_int(couch_db:name(Target), []), Fun = fun(FullDocInfo, _, Acc) -> - {ok, DocSource} = couch_db:open_doc(SourceDb, FullDocInfo), + {ok, DocSource} = couch_db:open_doc( + SourceDb, FullDocInfo, [conflicts, deleted_conflicts]), Id = DocSource#doc.id, etap:diag("Verifying document " ++ ?b2l(Id)), - {ok, DocTarget} = couch_db:open_doc(TargetDb, Id), + {ok, DocTarget} = couch_db:open_doc( + TargetDb, Id, [conflicts, deleted_conflicts]), etap:is(DocTarget#doc.body, DocSource#doc.body, "Same body in source and target databases"), etap:is( - couch_doc:to_json_obj(DocTarget, [conflicts, deleted_conflicts]), - couch_doc:to_json_obj(DocSource, [conflicts, deleted_conflicts]), + couch_doc:to_json_obj(DocTarget, []), + couch_doc:to_json_obj(DocSource, []), "Same doc body in source and target databases"), #doc{atts = SourceAtts} = DocSource,