diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2019-12-27 17:02:08 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2019-12-27 17:02:08 +0300 |
| commit | 99002cd2cf3947586a6f65a1ae0948f6c97c3b33 (patch) | |
| tree | 3e8dc40866f50df21525ae0ab047fbf0959a58ac | |
| parent | 79fac750d838da3b129ed6260e8d6a711d57d0e4 (diff) | |
| download | rabbitmq-server-git-99002cd2cf3947586a6f65a1ae0948f6c97c3b33.tar.gz | |
vhost_SUITE: update expectations post-#2195
We need to find another way to screw virtual host
recovery post-#2195.
| -rw-r--r-- | test/vhost_SUITE.erl | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/test/vhost_SUITE.erl b/test/vhost_SUITE.erl index 123bf741f0..81d2a6a50e 100644 --- a/test/vhost_SUITE.erl +++ b/test/vhost_SUITE.erl @@ -313,14 +313,12 @@ node_starts_with_dead_vhosts(Config) -> %% The node should start without a vhost ok = rabbit_ct_broker_helpers:start_node(Config, 1), - timer:sleep(500), + timer:sleep(1500), - 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]), - [VHost1] = rabbit_ct_broker_helpers:rpc(Config, 1, - rabbit_vhost_sup_sup, check, []). + ?assertEqual(true, rabbit_ct_broker_helpers:rpc(Config, 1, + rabbit_vhost_sup_sup, is_vhost_alive, [VHost2])), + ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 1, + rabbit_vhost_sup_sup, check, [])). node_starts_with_dead_vhosts_and_ignore_slaves(Config) -> VHost1 = <<"vhost1">>, @@ -346,8 +344,8 @@ node_starts_with_dead_vhosts_and_ignore_slaves(Config) -> [VHost1, <<"mirror">>, <<".*">>, [{<<"ha-mode">>, <<"all">>}], 0, <<"queues">>, <<"acting-user">>]), - %% Wait for the queue to create a slave - timer:sleep(300), + %% Wait for the queue to start a mirror + timer:sleep(500), rabbit_ct_client_helpers:publish(Chan, QName, 10), @@ -372,14 +370,12 @@ node_starts_with_dead_vhosts_and_ignore_slaves(Config) -> %% The node should start without a vhost ok = rabbit_ct_broker_helpers:start_node(Config, 1), - timer:sleep(500), + timer:sleep(1500), - 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]), - [VHost1] = rabbit_ct_broker_helpers:rpc(Config, 1, - rabbit_vhost_sup_sup, check, []). + ?assertEqual(true, rabbit_ct_broker_helpers:rpc(Config, 1, + rabbit_vhost_sup_sup, is_vhost_alive, [VHost2])), + ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 1, + rabbit_vhost_sup_sup, check, [])). vhost_creation_idempotency(Config) -> VHost = <<"idempotency-test">>, |