Merge pull request #898 from basho/bugfix/dvv-set-eqc-timeout

Bound testing time for riak_object_dvv_statem
basho · Apr 10, 2014 · aa0ae89 · aa0ae89
2 parents 9f6f218 + a3b36d4
commit aa0ae89
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/test/riak_object_dvv_statem.erl b/test/riak_object_dvv_statem.erl
@@ -67,7 +67,9 @@ eqc_test_() ->
      fun(_) ->
              meck:unload(riak_core_bucket)
      end,
-     [{timeout, 60, ?_assertEqual(true, eqc:quickcheck(eqc:numtests(1000, ?QC_OUT(prop_merge()))))}]
+     %% Kelly and Andrew T. have both recommended setting the eunit
+     %% timeout at 2x the `eqc:testing_time'.
+     [{timeout, 120, ?_assertEqual(true, eqc:quickcheck(eqc:testing_time(60, ?QC_OUT(prop_merge()))))}]
     }.
 
 run() ->