Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Re-enable "replaced" tests

This commit is contained in:
Evgeniy Khramtsov 2017-02-21 12:53:08 +03:00
parent 6ffd5ffd0c
commit 635dfa2eae
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/replaced_tests.erl
View File

@ -43,10 +43,8 @@ single_cases() ->
%%% Master-slave tests %%% Master-slave tests
%%%=================================================================== %%%===================================================================
master_slave_cases() -> master_slave_cases() ->
{replaced_master_slave, [sequence], []}. {replaced_master_slave, [sequence],
%% Disable tests for now due to a race condition [master_slave_test(conflict)]}.
%% because ejabberd_sm:sid() is generated in ejabberd_s2s:init()
%%[master_slave_test(conflict)]}.
conflict_master(Config0) -> conflict_master(Config0) ->
Config = bind(Config0), Config = bind(Config0),