diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2019-08-14 16:30:02 -0400 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2019-08-16 12:34:48 -0400 |
| commit | ae62936dbbb5792bb832093667fe1f78524a2ff8 (patch) | |
| tree | 650bd642c82fbd8cc90bf60b39c92ed03de8b9c9 | |
| parent | 9ca6ab2d093869844c6aa591423e82f2d6988a9c (diff) | |
| download | couchdb-ae62936dbbb5792bb832093667fe1f78524a2ff8.tar.gz | |
Extend timeouts for chttpd_view_test suite
More occasional flakiness on Jenkins.
| -rw-r--r-- | src/chttpd/test/eunit/chttpd_view_test.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/chttpd/test/eunit/chttpd_view_test.erl b/src/chttpd/test/eunit/chttpd_view_test.erl index 3457c6f30..4c224bb4e 100644 --- a/src/chttpd/test/eunit/chttpd_view_test.erl +++ b/src/chttpd/test/eunit/chttpd_view_test.erl @@ -24,6 +24,7 @@ -define(FIXTURE_TXT, ?ABS_PATH(?FILE)). -define(i2l(I), integer_to_list(I)). +-define(TIMEOUT, 60). % seconds setup() -> Hashed = couch_passwords:hash_admin_password(?PASS), @@ -71,7 +72,7 @@ all_view_test_() -> should_succeed_on_view_with_queries_keys(Url) -> - ?_test(begin + {timeout, ?TIMEOUT, ?_test(begin [create_doc(Url, "testdoc" ++ ?i2l(I)) || I <- lists:seq(1, 10)], {ok, _, _, _} = test_request:put(Url ++ "/_design/bar", [?CONTENT_JSON, ?AUTH], ?DDOC), @@ -83,11 +84,11 @@ should_succeed_on_view_with_queries_keys(Url) -> ResultJsonBody = couch_util:get_value(<<"results">>, ResultJson), {InnerJson} = lists:nth(1, ResultJsonBody), ?assertEqual(2, length(couch_util:get_value(<<"rows">>, InnerJson))) - end). + end)}. should_succeed_on_view_with_queries_limit_skip(Url) -> - ?_test(begin + {timeout, ?TIMEOUT, ?_test(begin [create_doc(Url, "testdoc" ++ ?i2l(I)) || I <- lists:seq(1, 10)], {ok, _, _, _} = test_request:put(Url ++ "/_design/bar", [?CONTENT_JSON, ?AUTH], ?DDOC), @@ -100,11 +101,11 @@ should_succeed_on_view_with_queries_limit_skip(Url) -> {InnerJson} = lists:nth(1, ResultJsonBody), ?assertEqual(2, couch_util:get_value(<<"offset">>, InnerJson)), ?assertEqual(5, length(couch_util:get_value(<<"rows">>, InnerJson))) - end). + end)}. should_succeed_on_view_with_multiple_queries(Url) -> - ?_test(begin + {timeout, ?TIMEOUT, ?_test(begin [create_doc(Url, "testdoc" ++ ?i2l(I)) || I <- lists:seq(1, 10)], {ok, _, _, _} = test_request:put(Url ++ "/_design/bar", [?CONTENT_JSON, ?AUTH], ?DDOC), @@ -120,4 +121,4 @@ should_succeed_on_view_with_multiple_queries(Url) -> {InnerJson2} = lists:nth(2, ResultJsonBody), ?assertEqual(2, couch_util:get_value(<<"offset">>, InnerJson2)), ?assertEqual(5, length(couch_util:get_value(<<"rows">>, InnerJson2))) - end). + end)}. |