summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2019-05-29 14:29:44 +0100
committerGitHub <noreply@github.com>2019-05-29 14:29:44 +0100
commite7166314e4e661c9d87b4bcc8d2d2aa496ef27b7 (patch)
tree6dbe3971306bbc958d1c3c8eecb8bb19daf1a3cd /test
parentaeb23f71a3dd6584aadc090fc4e104483e621695 (diff)
parentd6f4bdc10a7e752e4b19a1db0e5c5a7d83a3fccd (diff)
downloadrabbitmq-server-git-e7166314e4e661c9d87b4bcc8d2d2aa496ef27b7.tar.gz
Merge pull request #2018 from rabbitmq/rabbitmq-cli-302
'check' function for health check of virtual hosts
Diffstat (limited to 'test')
-rw-r--r--test/vhost_SUITE.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/vhost_SUITE.erl b/test/vhost_SUITE.erl
index 5e598d9f90..123bf741f0 100644
--- a/test/vhost_SUITE.erl
+++ b/test/vhost_SUITE.erl
@@ -318,7 +318,9 @@ node_starts_with_dead_vhosts(Config) ->
false = rabbit_ct_broker_helpers:rpc(Config, 1,
rabbit_vhost_sup_sup, is_vhost_alive, [VHost1]),
true = rabbit_ct_broker_helpers:rpc(Config, 1,
- rabbit_vhost_sup_sup, is_vhost_alive, [VHost2]).
+ rabbit_vhost_sup_sup, is_vhost_alive, [VHost2]),
+ [VHost1] = rabbit_ct_broker_helpers:rpc(Config, 1,
+ rabbit_vhost_sup_sup, check, []).
node_starts_with_dead_vhosts_and_ignore_slaves(Config) ->
VHost1 = <<"vhost1">>,
@@ -331,6 +333,8 @@ node_starts_with_dead_vhosts_and_ignore_slaves(Config) ->
rabbit_vhost_sup_sup, is_vhost_alive, [VHost1]),
true = rabbit_ct_broker_helpers:rpc(Config, 1,
rabbit_vhost_sup_sup, is_vhost_alive, [VHost2]),
+ [] = rabbit_ct_broker_helpers:rpc(Config, 1,
+ rabbit_vhost_sup_sup, check, []),
Conn = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 0, VHost1),
{ok, Chan} = amqp_connection:open_channel(Conn),
@@ -373,7 +377,9 @@ node_starts_with_dead_vhosts_and_ignore_slaves(Config) ->
false = rabbit_ct_broker_helpers:rpc(Config, 1,
rabbit_vhost_sup_sup, is_vhost_alive, [VHost1]),
true = rabbit_ct_broker_helpers:rpc(Config, 1,
- rabbit_vhost_sup_sup, is_vhost_alive, [VHost2]).
+ rabbit_vhost_sup_sup, is_vhost_alive, [VHost2]),
+ [VHost1] = rabbit_ct_broker_helpers:rpc(Config, 1,
+ rabbit_vhost_sup_sup, check, []).
vhost_creation_idempotency(Config) ->
VHost = <<"idempotency-test">>,