Skip to content

Commit

Permalink
Revert "Revert "re-enable "flaky" test in quest to nail down #745""
Browse files Browse the repository at this point in the history
This reverts commit ba624ea.
  • Loading branch information
nickva committed Mar 23, 2018
1 parent 45da9f3 commit 97e14a8
Showing 1 changed file with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}.

Expand Down Expand Up @@ -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}) ->
Expand All @@ -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) ->
Expand Down Expand Up @@ -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) ->
Expand Down

0 comments on commit 97e14a8

Please sign in to comment.