diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2020-10-21 11:32:32 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2020-10-21 11:32:32 +0200 |
| commit | 2c4ad90953b79fc6cc814b47cd7b0617cea10e8c (patch) | |
| tree | 18b21bd30ac2c72d9f97daf7ac8ee0e82b2521ae | |
| parent | b41ed423cb4ac8205f33d268daf1e7f15c90ffae (diff) | |
| download | rabbitmq-server-git-stream-queue-leader-locator.tar.gz | |
Fix conflictstream-queue-leader-locator
| -rw-r--r-- | test/rabbit_stream_queue_SUITE.erl | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/rabbit_stream_queue_SUITE.erl b/test/rabbit_stream_queue_SUITE.erl index c2157d9447..5ae4de82f4 100644 --- a/test/rabbit_stream_queue_SUITE.erl +++ b/test/rabbit_stream_queue_SUITE.erl @@ -1109,11 +1109,7 @@ leader_failover(Config) -> ok = rabbit_ct_broker_helpers:start_node(Config, Server1). initial_cluster_size_one(Config) -> -<<<<<<< HEAD [Server1 | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename), -======= - [Server1, _Server2, _Server3] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename), ->>>>>>> master Ch = rabbit_ct_client_helpers:open_channel(Config, Server1), Q = ?config(queue_name, Config), @@ -1127,11 +1123,7 @@ initial_cluster_size_one(Config) -> amqp_channel:call(Ch, #'queue.delete'{queue = Q})). initial_cluster_size_two(Config) -> -<<<<<<< HEAD [Server1 | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename), -======= - [Server1, _Server2, _Server3] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename), ->>>>>>> master Ch = rabbit_ct_client_helpers:open_channel(Config, Server1), Q = ?config(queue_name, Config), |