Adjust timeouts to a sane cutoff
Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/fb1b7e72 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/fb1b7e72 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/fb1b7e72 Branch: refs/heads/master Commit: fb1b7e7201db1cb33dc1a03d50caab0ba55f3803 Parents: 5752dbc Author: Paul J. Davis <[email protected]> Authored: Mon Jun 16 21:14:57 2014 -0500 Committer: Paul J. Davis <[email protected]> Committed: Mon Jun 16 21:14:57 2014 -0500 ---------------------------------------------------------------------- test/jiffy_10_short_double_tests.erl | 2 +- test/jiffy_11_proper_tests.erl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/fb1b7e72/test/jiffy_10_short_double_tests.erl ---------------------------------------------------------------------- diff --git a/test/jiffy_10_short_double_tests.erl b/test/jiffy_10_short_double_tests.erl index 1c1d069..bb2f1b8 100644 --- a/test/jiffy_10_short_double_tests.erl +++ b/test/jiffy_10_short_double_tests.erl @@ -14,7 +14,7 @@ filename() -> "../test/cases/short-doubles.txt". short_double_test() -> {ok, Fd} = file:open(filename(), [read, binary, raw]), - {"all doubles round trip", ?assertEqual(0, run(Fd, 0))}. + {"all doubles round trip", {timeout, 300, ?assertEqual(0, run(Fd, 0))}}. run(Fd, Acc) -> http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/fb1b7e72/test/jiffy_11_proper_tests.erl ---------------------------------------------------------------------- diff --git a/test/jiffy_11_proper_tests.erl b/test/jiffy_11_proper_tests.erl index aca542e..2c254bf 100644 --- a/test/jiffy_11_proper_tests.erl +++ b/test/jiffy_11_proper_tests.erl @@ -17,17 +17,17 @@ opts() -> run(Name) -> {msg("~s", [Name]), [ - {timeout, 3600, ?_assert(proper:quickcheck(?MODULE:Name(), opts()))} + {timeout, 300, ?_assert(proper:quickcheck(?MODULE:Name(), opts()))} ]}. proper_encode_decode_test_() -> - {timeout, 3600, [ + [ run(prop_enc_dec), run(prop_enc_dec_pretty), run(prop_enc_no_crash), run(prop_dec_no_crash_bin), run(prop_dec_no_crash_any) - ]}. + ]. prop_enc_dec() -> ?FORALL(Data, json(),
