Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-08 21:43:07 +02:00
Code Releases Activity

Disable offline_from_mam tests on riak since it doesn't support mam

Browse Source
This commit is contained in:
Paweł Chmielowski 2019-04-29 18:31:07 +02:00
parent 1db22c9656
commit d32a0ce566
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/ejabberd_SUITE.erl
View File

@ -411,7 +411,7 @@ db_tests(riak) ->
muc_tests:master_slave_cases(), muc_tests:master_slave_cases(),
privacy_tests:master_slave_cases(), privacy_tests:master_slave_cases(),
roster_tests:master_slave_cases(), roster_tests:master_slave_cases(),
offline_tests:master_slave_cases(), offline_tests:master_slave_cases(riak),
vcard_tests:master_slave_cases(), vcard_tests:master_slave_cases(),
announce_tests:master_slave_cases(), announce_tests:master_slave_cases(),
carbons_tests:master_slave_cases()]; carbons_tests:master_slave_cases()];
@ -439,14 +439,14 @@ db_tests(DB) when DB == mnesia; DB == redis ->
privacy_tests:master_slave_cases(), privacy_tests:master_slave_cases(),
pubsub_tests:master_slave_cases(), pubsub_tests:master_slave_cases(),
roster_tests:master_slave_cases(), roster_tests:master_slave_cases(),
offline_tests:master_slave_cases(), offline_tests:master_slave_cases(DB),
mam_tests:master_slave_cases(), mam_tests:master_slave_cases(),
vcard_tests:master_slave_cases(), vcard_tests:master_slave_cases(),
announce_tests:master_slave_cases(), announce_tests:master_slave_cases(),
carbons_tests:master_slave_cases(), carbons_tests:master_slave_cases(),
csi_tests:master_slave_cases(), csi_tests:master_slave_cases(),
push_tests:master_slave_cases()]; push_tests:master_slave_cases()];
db_tests(_) -> db_tests(DB) ->
[{single_user, [sequence], [{single_user, [sequence],
[test_register, [test_register,
legacy_auth_tests(), legacy_auth_tests(),
@ -468,7 +468,7 @@ db_tests(_) ->
privacy_tests:master_slave_cases(), privacy_tests:master_slave_cases(),
pubsub_tests:master_slave_cases(), pubsub_tests:master_slave_cases(),
roster_tests:master_slave_cases(), roster_tests:master_slave_cases(),
offline_tests:master_slave_cases(), offline_tests:master_slave_cases(DB),
mam_tests:master_slave_cases(), mam_tests:master_slave_cases(),
vcard_tests:master_slave_cases(), vcard_tests:master_slave_cases(),
announce_tests:master_slave_cases(), announce_tests:master_slave_cases(),

10
test/offline_tests.erl
View File

@ -141,11 +141,15 @@ unsupported_iq(Config) ->
%%%=================================================================== %%%===================================================================
%%% Master-slave tests %%% Master-slave tests
%%%=================================================================== %%%===================================================================
master_slave_cases() -> master_slave_cases(DB) ->
{offline_master_slave, [sequence], {offline_master_slave, [sequence],
[master_slave_test(flex), [master_slave_test(flex),
master_slave_test(send_all), master_slave_test(send_all)] ++
master_slave_test(from_mam)]}. case DB of
riak -> [];
_ -> [master_slave_test(from_mam)]
end
}.
flex_master(Config) -> flex_master(Config) ->
send_messages(Config, 5), send_messages(Config, 5),