diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2018-09-14 20:27:59 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2018-09-14 20:27:59 +0200 |
| commit | d4579d2a2009cdb69ef2ae52ae6419c27409070e (patch) | |
| tree | 6811abbe1c33e8305576576f546fc2a9554b5ec2 | |
| parent | [tests] Update stream_id from stream:stream after auth (diff) | |
[test] Improve match macro
| -rw-r--r-- | test/suite.erl | 6 | ||||
| -rw-r--r-- | test/suite.hrl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/suite.erl b/test/suite.erl index ecdbd71fb..efe587253 100644 --- a/test/suite.erl +++ b/test/suite.erl @@ -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), diff --git a/test/suite.hrl b/test/suite.hrl index adc14e93a..b2515d8ce 100644 --- a/test/suite.hrl +++ b/test/suite.hrl @@ -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">>). |