You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 17:06:41 UTC
[46/50] mochiweb commit: updated refs/heads/import-upstream to 8eb1f22
Update test/mochiweb_tests.erl
* With Erlang R16B03 running on FreeBSD/amd64 10.0-PRERELEASE
(base/stable/10 r260159),
the following tests will not finish
within the default eunit timeout of 5 seconds
(See `lib/eunit/src/eunit_internal.hrl` (of R16B03))
so cases modified to extend timeout to 60 seconds (`LARGE_TIMEOUT`):
% note well the underscore at the end of function names
single_100k_http_POST_test_()
single_100k_https_POST_test_()
multiple_100k_http_POST_test_()
multiple_100k_https_POST_test_()
See also <https://github.com/mochi/mochiweb/commit/02066a511adcad08bb05d7a4a36ca1fc9ca08805>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/67e6863b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/67e6863b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/67e6863b
Branch: refs/heads/import-upstream
Commit: 67e6863b9e329c88c1c34ca490818d34926e5321
Parents: 1d73383
Author: Kenji Rikitake <ke...@acm.org>
Authored: Fri Jan 3 17:56:50 2014 +0900
Committer: Kenji Rikitake <ke...@acm.org>
Committed: Fri Jan 3 18:02:43 2014 +0900
----------------------------------------------------------------------
test/mochiweb_tests.erl | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/67e6863b/test/mochiweb_tests.erl
----------------------------------------------------------------------
diff --git a/test/mochiweb_tests.erl b/test/mochiweb_tests.erl
index a272eed..c8bc8ac 100644
--- a/test/mochiweb_tests.erl
+++ b/test/mochiweb_tests.erl
@@ -63,17 +63,21 @@ single_2k_http_POST_test() ->
single_2k_https_POST_test() ->
do_POST(ssl, 2048, 1).
-single_100k_http_POST_test() ->
- do_POST(plain, 102400, 1).
+single_100k_http_POST_test_() -> % note the underscore
+ {timeout, ?LARGE_TIMEOUT,
+ fun() -> ?assertEqual(ok, do_POST(plain, 102400, 1)) end}.
-single_100k_https_POST_test() ->
- do_POST(ssl, 102400, 1).
+single_100k_https_POST_test_() -> % note the underscore
+ {timeout, ?LARGE_TIMEOUT,
+ fun() -> ?assertEqual(ok, do_POST(ssl, 102400, 1)) end}.
multiple_100k_http_POST_test() ->
- do_POST(plain, 102400, 3).
+ {timeout, ?LARGE_TIMEOUT,
+ fun() -> ?assertEqual(ok, do_POST(plain, 102400, 3)) end}.
multiple_100K_https_POST_test() ->
- do_POST(ssl, 102400, 3).
+ {timeout, ?LARGE_TIMEOUT,
+ fun() -> ?assertEqual(ok, do_POST(ssl, 102400, 3)) end}.
hundred_128_http_POST_test_() -> % note the underscore
{timeout, ?LARGE_TIMEOUT,