Updated Branches: refs/heads/1.2.x 268fb7ab0 -> 9fe299a59
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/9fe299a5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9fe299a5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9fe299a5 Branch: refs/heads/1.2.x Commit: 9fe299a5921d7f0b05be35416866bb247df91e8c Parents: 268fb7a Author: Filipe David Borba Manana <[email protected]> Authored: Sat Jan 7 12:44:16 2012 +0000 Committer: Filipe David Borba Manana <[email protected]> Committed: Sat Jan 7 13:00:13 2012 +0000 ---------------------------------------------------------------------- test/etap/242-replication-many-leaves.t | 8 ++++---- test/etap/243-doc-missing-stubs.t | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/9fe299a5/test/etap/242-replication-many-leaves.t ---------------------------------------------------------------------- diff --git a/test/etap/242-replication-many-leaves.t b/test/etap/242-replication-many-leaves.t index 22c7df8..d8d3eb9 100755 --- a/test/etap/242-replication-many-leaves.t +++ b/test/etap/242-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/9fe299a5/test/etap/243-doc-missing-stubs.t ---------------------------------------------------------------------- diff --git a/test/etap/243-doc-missing-stubs.t b/test/etap/243-doc-missing-stubs.t index 04ec021..e17efc9 100755 --- a/test/etap/243-doc-missing-stubs.t +++ b/test/etap/243-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,
