diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-06-02 13:40:34 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-10-20 14:49:52 +0100 |
| commit | 460abf24db53b0137271cb24db41ec520fabc75b (patch) | |
| tree | 77584db29a573532aeecba6992fdc84bfab27bc5 | |
| parent | 93ba24b4327ab66c288a10fcfe1d131e53dcd477 (diff) | |
| download | rabbitmq-server-git-460abf24db53b0137271cb24db41ec520fabc75b.tar.gz | |
Update tests
| -rw-r--r-- | src/rabbit_vm.erl | 4 | ||||
| -rw-r--r-- | test/channel_operation_timeout_test_queue.erl | 4 | ||||
| -rw-r--r-- | test/unit_inbroker_SUITE.erl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 9c8732bb6b..1e3e65abc4 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -43,7 +43,7 @@ memory() -> || Names <- distinguished_interesting_sups()], Mnesia = mnesia_memory(), - MsgIndexETS = ets_memory([msg_store_persistent, msg_store_transient]), + MsgIndexETS = ets_memory([msg_store_persistent_vhost, msg_store_transient_vhost]), MgmtDbETS = ets_memory([rabbit_mgmt_event_collector]), [{total, Total}, @@ -141,7 +141,7 @@ interesting_sups() -> [[rabbit_amqqueue_sup_sup], conn_sups() | interesting_sups0()]. interesting_sups0() -> - MsgIndexProcs = [msg_store_transient, msg_store_persistent], + MsgIndexProcs = [msg_store_transient_vhost, msg_store_persistent_vhost], MgmtDbProcs = [rabbit_mgmt_sup_sup], PluginProcs = plugin_sups(), [MsgIndexProcs, MgmtDbProcs, PluginProcs]. diff --git a/test/channel_operation_timeout_test_queue.erl b/test/channel_operation_timeout_test_queue.erl index 4407a24e7f..3a284c592b 100644 --- a/test/channel_operation_timeout_test_queue.erl +++ b/test/channel_operation_timeout_test_queue.erl @@ -111,8 +111,8 @@ }). -define(HEADER_GUESS_SIZE, 100). %% see determine_persist_to/2 --define(PERSISTENT_MSG_STORE, msg_store_persistent). --define(TRANSIENT_MSG_STORE, msg_store_transient). +-define(PERSISTENT_MSG_STORE, msg_store_persistent_vhost). +-define(TRANSIENT_MSG_STORE, msg_store_transient_vhost). -define(QUEUE, lqueue). -define(TIMEOUT_TEST_MSG, <<"timeout_test_msg!">>). diff --git a/test/unit_inbroker_SUITE.erl b/test/unit_inbroker_SUITE.erl index 7b783facd2..a82887d8df 100644 --- a/test/unit_inbroker_SUITE.erl +++ b/test/unit_inbroker_SUITE.erl @@ -22,8 +22,8 @@ -compile(export_all). --define(PERSISTENT_MSG_STORE, msg_store_persistent). --define(TRANSIENT_MSG_STORE, msg_store_transient). +-define(PERSISTENT_MSG_STORE, msg_store_persistent_vhost). +-define(TRANSIENT_MSG_STORE, msg_store_transient_vhost). -define(TIMEOUT_LIST_OPS_PASS, 5000). -define(TIMEOUT, 30000). |