diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-18 13:39:10 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-18 13:39:10 +0300 |
| commit | f57f267c542a8e6ddbb31cb3ba05c4fd3798f998 (patch) | |
| tree | 4322c5f5b94f4d4f657aaa2199fc963cfc485bc8 /test | |
| parent | Make common tests working again (diff) | |
| parent | Add auth to mod_http_fileserver (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Conflicts:
test/ejabberd_SUITE.erl
Diffstat (limited to 'test')
| -rw-r--r-- | test/suite.erl | 15 | ||||
| -rw-r--r-- | test/suite.hrl | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/test/suite.erl b/test/suite.erl index a288a5f6..49ebaa89 100644 --- a/test/suite.erl +++ b/test/suite.erl @@ -481,9 +481,22 @@ format_element(El) -> false -> io_lib:format(" ~s~n", El) end. +substitute_forwarded(#mam_result{sub_els = Sub} = El) -> + El#mam_result{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]}; +substitute_forwarded(#carbons_sent{forwarded = Sub} = El) -> + El#carbons_sent{forwarded = [substitute_forwarded(SEl) || SEl <- Sub]}; +substitute_forwarded(#message{sub_els = Sub} = El) -> + El#message{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]}; +substitute_forwarded(#forwarded{delay = Delay, xml_els = Sub}) -> + #forwarded_decoded{delay = Delay, sub_els = [xmpp:decode(SEl) || SEl <- Sub]}; +substitute_forwarded(El) -> + El. + + + decode(El, NS, Opts) -> try - Pkt = xmpp:decode(El, NS, Opts), + Pkt = substitute_forwarded(xmpp:decode(El, NS, Opts)), ct:pal("RECV:~n~s~n~s", [format_element(El), xmpp:pp(Pkt)]), Pkt diff --git a/test/suite.hrl b/test/suite.hrl index 00239f8c..d9a9c5ab 100644 --- a/test/suite.hrl +++ b/test/suite.hrl @@ -5,6 +5,9 @@ -include("mod_proxy65.hrl"). -include("xmpp_codec.hrl"). +-record(forwarded_decoded, {delay :: #delay{}, + sub_els = [] :: [fxml:xmlel()]}). + -define(STREAM_TRAILER, <<"</stream:stream>">>). -define(PUBSUB(Node), <<(?NS_PUBSUB)/binary, "#", Node>>). |