25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Check item groups separately

This commit is contained in:
Evgeniy Khramtsov 2013-06-15 23:39:20 +10:00 committed by Alexey Shchepin
parent 3f8a10c092
commit 831dc1f253

View File

@ -645,7 +645,6 @@ roster_master(Config) ->
sub_els = sub_els =
[#roster{items = [#roster_item{ [#roster{items = [#roster_item{
jid = LPeer, jid = LPeer,
groups = Groups,
subscription = both}]}]}, subscription = both}]}]},
#iq{type = result, id = I1, sub_els = []}), #iq{type = result, id = I1, sub_els = []}),
send(Config, make_iq_result(Push5)), send(Config, make_iq_result(Push5)),
@ -659,19 +658,21 @@ roster_master(Config) ->
sub_els = sub_els =
[#roster{items = [#roster_item{ [#roster{items = [#roster_item{
jid = LPeer, jid = LPeer,
groups = Groups,
subscription = to}]}]}, subscription = to}]}]},
#iq{type = set, #iq{type = set,
sub_els = sub_els =
[#roster{items = [#roster_item{ [#roster{items = [#roster_item{
jid = LPeer, jid = LPeer,
groups = Groups,
subscription = none}]}]}, subscription = none}]}]},
#presence{type = unsubscribe, from = LPeer}, #presence{type = unsubscribe, from = LPeer},
#presence{type = unsubscribed, from = LPeer}, #presence{type = unsubscribed, from = LPeer},
#presence{type = unavailable, from = Peer}), #presence{type = unavailable, from = Peer}),
send(Config, make_iq_result(Push6)), send(Config, make_iq_result(Push6)),
send(Config, make_iq_result(Push7)), send(Config, make_iq_result(Push7)),
#iq{sub_els = [#roster{items = [#roster_item{groups = G1}]}]} = Push5,
#iq{sub_els = [#roster{items = [#roster_item{groups = G2}]}]} = Push6,
#iq{sub_els = [#roster{items = [#roster_item{groups = G3}]}]} = Push7,
Groups = lists:sort(G1), Groups = lists:sort(G2), Groups = lists:sort(G3),
disconnect(Config). disconnect(Config).
roster_slave(Config) -> roster_slave(Config) ->