summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-02-21 12:53:08 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-02-21 12:53:08 +0300
commit635dfa2eae64e4bd9a277b5f23e340afe1b620d6 (patch)
treeddec2fd327d68d29cf0a61e3066e6e7d116fa4a0 /test
parentTest stream management queue overload (diff)
Re-enable "replaced" tests
Diffstat (limited to 'test')
-rw-r--r--test/replaced_tests.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/replaced_tests.erl b/test/replaced_tests.erl
index 35df5e10..6141abd1 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),