mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-09 15:06:54 +02:00
[test] Improve match macro
This commit is contained in:
parent
410ac9b966
commit
d4579d2a20
@ -471,9 +471,7 @@ wait_auth_SASL_result(Config, ShouldFail) ->
|
||||
NS = if Type == client -> ?NS_CLIENT;
|
||||
Type == server -> ?NS_SERVER
|
||||
end,
|
||||
Config2 = receive #stream_start{id = ID, xmlns = NS, version = {1,0}} ->
|
||||
set_opt(stream_id, ID, Config)
|
||||
end,
|
||||
receive #stream_start{xmlns = NS, version = {1,0}} -> ok end,
|
||||
receive #stream_features{sub_els = Fs} ->
|
||||
if Type == client ->
|
||||
#xmpp_session{optional = true} =
|
||||
@ -490,7 +488,7 @@ wait_auth_SASL_result(Config, ShouldFail) ->
|
||||
set_opt(rosterver, true, ConfigAcc);
|
||||
(_, ConfigAcc) ->
|
||||
ConfigAcc
|
||||
end, Config2, Fs)
|
||||
end, Config, Fs)
|
||||
end;
|
||||
#sasl_challenge{text = ClientIn} ->
|
||||
{Response, SASL} = (?config(sasl, Config))(ClientIn),
|
||||
|
@ -66,12 +66,14 @@
|
||||
end)()).
|
||||
|
||||
-define(match(Pattern, Result),
|
||||
(fun() ->
|
||||
case Result of
|
||||
Pattern ->
|
||||
Pattern;
|
||||
ok;
|
||||
Mismatch ->
|
||||
suite:match_failure([Mismatch], [??Pattern])
|
||||
end).
|
||||
end
|
||||
end)()).
|
||||
|
||||
-define(COMMON_VHOST, <<"localhost">>).
|
||||
-define(MNESIA_VHOST, <<"mnesia.localhost">>).
|
||||
|
Loading…
Reference in New Issue
Block a user