aboutsummaryrefslogtreecommitdiff
path: root/test/ejabberd_SUITE.erl
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-12-07 15:55:18 +0100
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-12-07 15:55:18 +0100
commit9899935e42a0f12e9a5cbd52140680e20e4db45f (patch)
treeebc82b1d10c4f98a80b7523df11127f628b9b1d8 /test/ejabberd_SUITE.erl
parentMerge pull request #366 from weiss/remove-unused-field (diff)
Improve interface for adding timestamps
Provide a simpler interface for adding <delay/> and <x/> timestamps to stanzas. This also makes sure that only one <delay/> tag and one <x/> tag is added to a given stanza.
Diffstat (limited to '')
-rw-r--r--test/ejabberd_SUITE.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 50fa70bd9..380ed606f 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -801,7 +801,7 @@ pubsub(Config) ->
node = Node,
jid = my_jid(Config)}}]}),
?recv2(
- #message{sub_els = [#pubsub_event{}, #delay{}]},
+ #message{sub_els = [#pubsub_event{}, #delay{}, #legacy_delay{}]},
#iq{type = result, id = I1}),
%% Get subscriptions
true = lists:member(?PUBSUB("retrieve-subscriptions"), Features),
@@ -1588,7 +1588,8 @@ client_state_slave(Config) ->
body = [#text{data = <<"body">>}]} = recv(),
wait_for_master(Config),
send(Config, #csi{type = active}),
- ?recv2(#presence{from = Peer, type = unavailable, sub_els = [#delay{}]},
+ ?recv2(#presence{from = Peer, type = unavailable,
+ sub_els = [#delay{}, #legacy_delay{}]},
#message{from = Peer, thread = <<"1">>,
sub_els = [#chatstate{type = active}]}),
disconnect(Config).