summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2018-03-13 15:18:41 -0400
committerJan Lehnardt <jan@apache.org>2018-03-26 11:03:51 +0200
commit3d702d8e85068d65272dc10b4fa7015bf66fedf5 (patch)
tree14aaef8505026628d47386fdf088e7571ba359cb
parent45da9f307a5fa3d390c44289f87ed640082e0d37 (diff)
downloadcouchdb-3d702d8e85068d65272dc10b4fa7015bf66fedf5.tar.gz
Revert "Revert "re-enable "flaky" test in quest to nail down #745""
This reverts commit ba624ea7c26984b8ea52ec5e20534dc5f8508d3a.
-rw-r--r--src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl b/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl
index 6f3308c39..af3a285f5 100644
--- a/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl
+++ b/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl
@@ -61,8 +61,8 @@ reduce_max_request_size_test_() ->
% attachment which exceed maximum request size are simply
% closed instead of returning a 413 request. That makes these
% tests flaky.
- % ++ [{Pair, fun should_replicate_one_with_attachment/2}
- % || Pair <- Pairs]
+ ++ [{Pair, fun should_replicate_one_with_attachment/2}
+ || Pair <- Pairs]
}
}.
@@ -90,12 +90,12 @@ should_replicate_one({From, To}, {_Ctx, {Source, Target}}) ->
% POST-ing individual documents directly and skip bulk_docs. Test that case
% separately
% See note in main test function why this was disabled.
-% should_replicate_one_with_attachment({From, To}, {_Ctx, {Source, Target}}) ->
-% {lists:flatten(io_lib:format("~p -> ~p", [From, To])),
-% {inorder, [should_populate_source_one_large_attachment(Source),
-% should_populate_source(Source),
-% should_replicate(Source, Target),
-% should_compare_databases(Source, Target, [<<"doc0">>])]}}.
+should_replicate_one_with_attachment({From, To}, {_Ctx, {Source, Target}}) ->
+ {lists:flatten(io_lib:format("~p -> ~p", [From, To])),
+ {inorder, [should_populate_source_one_large_attachment(Source),
+ should_populate_source(Source),
+ should_replicate(Source, Target),
+ should_compare_databases(Source, Target, [<<"doc0">>])]}}.
should_populate_source({remote, Source}) ->
@@ -112,11 +112,11 @@ should_populate_source_one_large_one_small(Source) ->
{timeout, ?TIMEOUT_EUNIT, ?_test(one_large_one_small(Source, 12000, 3000))}.
-% should_populate_source_one_large_attachment({remote, Source}) ->
-% should_populate_source_one_large_attachment(Source);
+should_populate_source_one_large_attachment({remote, Source}) ->
+ should_populate_source_one_large_attachment(Source);
-% should_populate_source_one_large_attachment(Source) ->
-% {timeout, ?TIMEOUT_EUNIT, ?_test(one_large_attachment(Source, 70000, 70000))}.
+should_populate_source_one_large_attachment(Source) ->
+ {timeout, ?TIMEOUT_EUNIT, ?_test(one_large_attachment(Source, 70000, 70000))}.
should_replicate({remote, Source}, Target) ->
@@ -156,8 +156,8 @@ one_large_one_small(DbName, Large, Small) ->
add_doc(DbName, <<"doc1">>, Small, 0).
-% one_large_attachment(DbName, Size, AttSize) ->
-% add_doc(DbName, <<"doc0">>, Size, AttSize).
+one_large_attachment(DbName, Size, AttSize) ->
+ add_doc(DbName, <<"doc0">>, Size, AttSize).
add_doc(DbName, DocId, Size, AttSize) when is_binary(DocId) ->