You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2019/08/07 21:51:29 UTC

[couchdb] 01/03: Revert "Temporarily disable failing test"

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit d9eaf12c8a982d9a1fb0c7a4cb5b023535eed1a1
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Aug 7 17:50:37 2019 -0400

    Revert "Temporarily disable failing test"
    
    This reverts commit 174105e6ae2c644fa0c5b52c265471ce12045160.
---
 .../src/cpse_test_purge_replication.erl            | 164 ++++++++++-----------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/couch_pse_tests/src/cpse_test_purge_replication.erl b/src/couch_pse_tests/src/cpse_test_purge_replication.erl
index 5fb4d5a..4a08225 100644
--- a/src/couch_pse_tests/src/cpse_test_purge_replication.erl
+++ b/src/couch_pse_tests/src/cpse_test_purge_replication.erl
@@ -35,88 +35,88 @@ teardown_each({SrcDb, TgtDb}) ->
     ok = couch_server:delete(TgtDb, []).
 
 
-% cpse_purge_http_replication({Source, Target}) ->
-%     {ok, Rev1} = cpse_util:save_doc(Source, {[{'_id', foo}, {vsn, 1}]}),
-
-%     cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
-%         {doc_count, 1},
-%         {del_doc_count, 0},
-%         {update_seq, 1},
-%         {changes, 1},
-%         {purge_seq, 0},
-%         {purge_infos, []}
-%     ]),
-
-%     RepObject = {[
-%         {<<"source">>, db_url(Source)},
-%         {<<"target">>, db_url(Target)}
-%     ]},
-
-%     {ok, _} = couch_replicator:replicate(RepObject, ?ADMIN_USER),
-%     {ok, Doc1} = cpse_util:open_doc(Target, foo),
-
-%     cpse_util:assert_db_props(?MODULE, ?LINE, Target, [
-%         {doc_count, 1},
-%         {del_doc_count, 0},
-%         {update_seq, 1},
-%         {changes, 1},
-%         {purge_seq, 0},
-%         {purge_infos, []}
-%     ]),
-
-%     PurgeInfos = [
-%         {cpse_util:uuid(), <<"foo">>, [Rev1]}
-%     ],
-
-%     {ok, [{ok, PRevs}]} = cpse_util:purge(Source, PurgeInfos),
-%     ?assertEqual([Rev1], PRevs),
-
-%     cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
-%         {doc_count, 0},
-%         {del_doc_count, 0},
-%         {update_seq, 2},
-%         {changes, 0},
-%         {purge_seq, 1},
-%         {purge_infos, PurgeInfos}
-%     ]),
-
-%     % Show that a purge on the source is
-%     % not replicated to the target
-%     {ok, _} = couch_replicator:replicate(RepObject, ?ADMIN_USER),
-%     {ok, Doc2} = cpse_util:open_doc(Target, foo),
-%     [Rev2] = Doc2#doc_info.revs,
-%     ?assertEqual(Rev1, Rev2#rev_info.rev),
-%     ?assertEqual(Doc1, Doc2),
-
-%     cpse_util:assert_db_props(?MODULE, ?LINE, Target, [
-%         {doc_count, 1},
-%         {del_doc_count, 0},
-%         {update_seq, 1},
-%         {changes, 1},
-%         {purge_seq, 0},
-%         {purge_infos, []}
-%     ]),
-
-%     % Show that replicating from the target
-%     % back to the source reintroduces the doc
-%     RepObject2 = {[
-%         {<<"source">>, db_url(Target)},
-%         {<<"target">>, db_url(Source)}
-%     ]},
-
-%     {ok, _} = couch_replicator:replicate(RepObject2, ?ADMIN_USER),
-%     {ok, Doc3} = cpse_util:open_doc(Source, foo),
-%     [Revs3] = Doc3#doc_info.revs,
-%     ?assertEqual(Rev1, Revs3#rev_info.rev),
-
-%     cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
-%         {doc_count, 1},
-%         {del_doc_count, 0},
-%         {update_seq, 3},
-%         {changes, 1},
-%         {purge_seq, 1},
-%         {purge_infos, PurgeInfos}
-%     ]).
+cpse_purge_http_replication({Source, Target}) ->
+    {ok, Rev1} = cpse_util:save_doc(Source, {[{'_id', foo}, {vsn, 1}]}),
+
+    cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
+        {doc_count, 1},
+        {del_doc_count, 0},
+        {update_seq, 1},
+        {changes, 1},
+        {purge_seq, 0},
+        {purge_infos, []}
+    ]),
+
+    RepObject = {[
+        {<<"source">>, db_url(Source)},
+        {<<"target">>, db_url(Target)}
+    ]},
+
+    {ok, _} = couch_replicator:replicate(RepObject, ?ADMIN_USER),
+    {ok, Doc1} = cpse_util:open_doc(Target, foo),
+
+    cpse_util:assert_db_props(?MODULE, ?LINE, Target, [
+        {doc_count, 1},
+        {del_doc_count, 0},
+        {update_seq, 1},
+        {changes, 1},
+        {purge_seq, 0},
+        {purge_infos, []}
+    ]),
+
+    PurgeInfos = [
+        {cpse_util:uuid(), <<"foo">>, [Rev1]}
+    ],
+
+    {ok, [{ok, PRevs}]} = cpse_util:purge(Source, PurgeInfos),
+    ?assertEqual([Rev1], PRevs),
+
+    cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
+        {doc_count, 0},
+        {del_doc_count, 0},
+        {update_seq, 2},
+        {changes, 0},
+        {purge_seq, 1},
+        {purge_infos, PurgeInfos}
+    ]),
+
+    % Show that a purge on the source is
+    % not replicated to the target
+    {ok, _} = couch_replicator:replicate(RepObject, ?ADMIN_USER),
+    {ok, Doc2} = cpse_util:open_doc(Target, foo),
+    [Rev2] = Doc2#doc_info.revs,
+    ?assertEqual(Rev1, Rev2#rev_info.rev),
+    ?assertEqual(Doc1, Doc2),
+
+    cpse_util:assert_db_props(?MODULE, ?LINE, Target, [
+        {doc_count, 1},
+        {del_doc_count, 0},
+        {update_seq, 1},
+        {changes, 1},
+        {purge_seq, 0},
+        {purge_infos, []}
+    ]),
+
+    % Show that replicating from the target
+    % back to the source reintroduces the doc
+    RepObject2 = {[
+        {<<"source">>, db_url(Target)},
+        {<<"target">>, db_url(Source)}
+    ]},
+
+    {ok, _} = couch_replicator:replicate(RepObject2, ?ADMIN_USER),
+    {ok, Doc3} = cpse_util:open_doc(Source, foo),
+    [Revs3] = Doc3#doc_info.revs,
+    ?assertEqual(Rev1, Revs3#rev_info.rev),
+
+    cpse_util:assert_db_props(?MODULE, ?LINE, Source, [
+        {doc_count, 1},
+        {del_doc_count, 0},
+        {update_seq, 3},
+        {changes, 1},
+        {purge_seq, 1},
+        {purge_infos, PurgeInfos}
+    ]).
 
 
 cpse_purge_internal_repl_disabled({Source, Target}) ->