From 635dfa2eae64e4bd9a277b5f23e340afe1b620d6 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Tue, 21 Feb 2017 12:53:08 +0300 Subject: [PATCH] Re-enable "replaced" tests --- test/replaced_tests.erl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/replaced_tests.erl b/test/replaced_tests.erl index 35df5e10b..6141abd16 100644 --- a/test/replaced_tests.erl +++ b/test/replaced_tests.erl @@ -43,10 +43,8 @@ single_cases() -> %%% Master-slave tests %%%=================================================================== master_slave_cases() -> - {replaced_master_slave, [sequence], []}. -%% Disable tests for now due to a race condition -%% because ejabberd_sm:sid() is generated in ejabberd_s2s:init() -%%[master_slave_test(conflict)]}. + {replaced_master_slave, [sequence], + [master_slave_test(conflict)]}. conflict_master(Config0) -> Config = bind(Config0),