diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-06-14 22:05:06 +0400 |
---|---|---|
committer | Alexey Shchepin <alexey@process-one.net> | 2013-06-17 17:09:54 +0400 |
commit | 7865c6a146e24255f14590eb6e18bde80e40d134 (patch) | |
tree | 7d7f66a2b5171c1cecb631de4ca1862b22c85869 /test | |
parent | 1b96856d92d67ba0612ff7565a9c1dbd56a28c1f (diff) |
Don't include sub-elements in IQ results where it's not required
by the corresponding spec (RFC or XEP).
Diffstat (limited to 'test')
-rw-r--r-- | test/ejabberd_SUITE.erl | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index 304750b4e..043b7000b 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -223,10 +223,7 @@ register(Config) -> #iq{type = set, sub_els = [#register{username = ?config(user, Config), password = ?config(password, Config)}]}), - %% BUG: we should receive empty sub_els - %% TODO: fix in ejabberd - %% #iq{type = result, id = I2, sub_els = []} = recv(), - #iq{type = result, id = I2, sub_els = [#register{}]} = recv(), + #iq{type = result, id = I2, sub_els = []} = recv(), Config. test_unregister(Config) -> @@ -242,10 +239,7 @@ try_unregister(Config) -> I = send(Config, #iq{type = set, sub_els = [#register{remove = true}]}), - %% BUG: we should receive empty sub_els - %% TODO: fix in ejabberd - %% #iq{type = result, id = I, sub_els = []} = recv(), - #iq{type = result, id = I, sub_els = [#register{}]} = recv(), + #iq{type = result, id = I, sub_els = []} = recv(), #stream_error{reason = conflict} = recv(), Config. @@ -279,15 +273,7 @@ test_open_session(Config) -> open_session(Config) -> ID = send(Config, #iq{type = set, sub_els = [#session{}]}), - #iq{type = result, id = ID, sub_els = SubEls} = recv(), - case SubEls of - [] -> - ok; - [#session{}] -> - %% BUG: we should not receive this! - %% TODO: should be fixed in ejabberd - ok - end, + #iq{type = result, id = ID, sub_els = []} = recv(), Config. roster_get(Config) -> |