From 4a9f2247ca51edec1beb9609955e02cccd18f316 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Jun 2023 11:06:54 -0300 Subject: [PATCH] test(conf_app): fix bad merge conflict --- apps/emqx_conf/test/emqx_conf_app_SUITE.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl index f1a1383f0..2a9888451 100644 --- a/apps/emqx_conf/test/emqx_conf_app_SUITE.erl +++ b/apps/emqx_conf/test/emqx_conf_app_SUITE.erl @@ -107,11 +107,13 @@ t_copy_deprecated_data_dir(Config) -> stop_cluster(Nodes) end. -t_no_copy_from_newer_version_node(_Config) -> +t_no_copy_from_newer_version_node(Config) -> net_kernel:start(['master2@127.0.0.1', longnames]), ct:timetrap({seconds, 120}), snabbkaffe:fix_ct_logging(), - Cluster = cluster([cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})]), + Cluster = cluster( + [cluster_spec({core, 10}), cluster_spec({core, 11}), cluster_spec({core, 12})], Config + ), OKs = [ok, ok, ok], [First | Rest] = Nodes = start_cluster(Cluster), try