Merge branch 'az817-keys-eqc-fix' into 1.0

basho · Oct 10, 2011 · 6cb56ff · 6cb56ff
2 parents 5c4ed64 + 4a65de4
commit 6cb56ff
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/test/keys_fsm_eqc.erl b/test/keys_fsm_eqc.erl
@@ -233,6 +233,8 @@ dep_apps() ->
             application:set_env(riak_core, ring_creation_size, 64),
             application:set_env(riak_kv, storage_backend, riak_kv_memory_backend),
             application:set_env(riak_kv, vnode_vclocks, true),
+            application:set_env(riak_kv, delete_mode, immediate),
+            application:set_env(riak_kv, legacy_keylisting, false),
 
             %% Start riak_kv
             timer:sleep(500);
@@ -242,7 +244,7 @@ dep_apps() ->
     XX = fun(_) -> error_logger:info_msg("Registered: ~w\n", [lists:sort(registered())]) end,
     [sasl, crypto, riak_sysmon, webmachine, XX, os_mon,
      riak_core, XX, luke, erlang_js,
-     inets, mochiweb, riak_pipe, SetupFun, riak_kv].
+     inets, mochiweb, riak_pipe, SetupFun, riak_kv, SetupFun].
 
 do_dep_apps(StartStop, Apps) ->
     lists:map(fun(A) when is_atom(A) -> application:StartStop(A);