From 4a73d035dc77c4074f5e3c8d8bcf900138c91eb6 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Fri, 16 Feb 2018 16:12:36 +0100 Subject: [PATCH] re-enable "flaky" test in quest to nail down #745 --- ...plicator_small_max_request_size_target.erl | 28 +++++++++---------- 1 file 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 6f3308c3919..af3a285f5c0 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) ->