Permalink
Browse files

Increase timeout on slower tests

  • Loading branch information...
1 parent d950b95 commit 2d11479c89c9f02daacf05e44f37edec186ce4a1 @jtuple jtuple committed Nov 29, 2012
Showing with 8 additions and 2 deletions.
  1. +4 −1 src/bitcask_merge_delete.erl
  2. +4 −1 test/bitcask_timeshift.erl
@@ -137,7 +137,10 @@ delete_files(Files) ->
-ifdef(TEST).
-multiple_merges_during_fold_test() ->
+multiple_merges_during_fold_test_() ->
+ {timeout, 10, fun multiple_merges_during_fold_test_body/0}.
+
+multiple_merges_during_fold_test_body() ->
Dir = "/tmp/bc.multiple-merges-fold",
B = bitcask:open(Dir, [read_write, {max_file_size, 50}]),
PutSome = fun() ->
@@ -50,7 +50,10 @@ set_tstamp(Tstamp) ->
set_tstamp_step(Step) ->
erlang:put(meck_tstamp_step, Step).
-timeshift_test() ->
+timeshift_test_() ->
+ {timeout, 10, fun timeshift_test_body/0}.
+
+timeshift_test_body() ->
try
Dirname = "/tmp/bc.timeshift",
meck:new(bitcask_time, [passthrough]),

0 comments on commit 2d11479

Please sign in to comment.