yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(conf_app): fix bad merge conflict

This commit is contained in:
Thales Macedo Garitezi 2023-06-09 11:06:54 -03:00
parent 683b4d2f0f
commit 4a9f2247ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_conf/test/emqx_conf_app_SUITE.erl
View File

@ -107,11 +107,13 @@ t_copy_deprecated_data_dir(Config) ->
stop_cluster(Nodes) stop_cluster(Nodes)
end. 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]), net_kernel:start(['master2@127.0.0.1', longnames]),
ct:timetrap({seconds, 120}), ct:timetrap({seconds, 120}),
snabbkaffe:fix_ct_logging(), 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], OKs = [ok, ok, ok],
[First | Rest] = Nodes = start_cluster(Cluster), [First | Rest] = Nodes = start_cluster(Cluster),
try try