diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-09-13 12:30:05 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-09-13 12:30:05 +0300 |
| commit | e987b888481e3e68f6259e96e7c54af84d168c3c (patch) | |
| tree | 48ab94c92db66383f7dbf8f4d1a015b6f09f5820 /test/suite.erl | |
| parent | Rename #error{} record to #stanza_error{} (diff) | |
Make common tests working again
Diffstat (limited to '')
| -rw-r--r-- | test/suite.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test/suite.erl b/test/suite.erl index c5593c4cf..d89a49ef8 100644 --- a/test/suite.erl +++ b/test/suite.erl @@ -199,7 +199,7 @@ bind(Config) -> open_session(Config) -> #iq{type = result, sub_els = []} = - send_recv(Config, #iq{type = set, sub_els = [#session{}]}), + send_recv(Config, #iq{type = set, sub_els = [#xmpp_session{}]}), Config. auth_SASL(Mech, Config) -> @@ -252,10 +252,15 @@ match_failure(Received, Matches) -> recv() -> receive {'$gen_event', {xmlstreamelement, El}} -> - Pkt = xmpp_codec:decode(fix_ns(El)), - ct:pal("recv: ~p ->~n~s", [El, xmpp_codec:pp(Pkt)]), - Pkt; - {'$gen_event', Event} -> + try + Pkt = xmpp:decode(El), + ct:pal("recv: ~p ->~n~s", [El, xmpp_codec:pp(Pkt)]), + Pkt + catch _:{xmpp_codec, Why} -> + ct:fail("recv failed: ~p->~n~s", + [El, xmpp:format_error(Why)]) + end; + {'$gen_event', Event} -> Event end. @@ -404,9 +409,9 @@ mix_room_jid(Config) -> jid:make(<<"test">>, <<"mix.", Server/binary>>, <<>>). id() -> - id(undefined). + id(<<>>). -id(undefined) -> +id(<<>>) -> randoms:get_string(); id(ID) -> ID. |