mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-24 16:23:40 +01:00
Test: Fix some minor compilation warnings
- This QueryID is unnecessary sinced3aeed8
, due tod6e9e03
- DB variable was added ind32a0ce
to detect riak and disable some tests, but support for Riak was removed later in3f7d9e3
. - MyJID was added in5b863c2
but was never actually used - recv2 return should be checked
This commit is contained in:
parent
697e5b8b6c
commit
e973360aa7
@ -492,7 +492,7 @@ send_query(Config, #mam_query{xmlns = NS} = Query) ->
|
|||||||
maybe_recv_iq_result(Config, NS, I),
|
maybe_recv_iq_result(Config, NS, I),
|
||||||
I.
|
I.
|
||||||
|
|
||||||
recv_fin(Config, I, QueryID, NS, IsComplete) when NS == ?NS_MAM_1; NS == ?NS_MAM_2 ->
|
recv_fin(Config, I, _QueryID, NS, IsComplete) when NS == ?NS_MAM_1; NS == ?NS_MAM_2 ->
|
||||||
ct:comment("Receiving fin iq for namespace '~s'", [NS]),
|
ct:comment("Receiving fin iq for namespace '~s'", [NS]),
|
||||||
#iq{type = result, id = I,
|
#iq{type = result, id = I,
|
||||||
sub_els = [#mam_fin{xmlns = NS,
|
sub_els = [#mam_fin{xmlns = NS,
|
||||||
|
@ -142,7 +142,7 @@ unsupported_iq(Config) ->
|
|||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% Master-slave tests
|
%%% Master-slave tests
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
master_slave_cases(DB) ->
|
master_slave_cases(_DB) ->
|
||||||
{offline_master_slave, [sequence],
|
{offline_master_slave, [sequence],
|
||||||
[master_slave_test(flex),
|
[master_slave_test(flex),
|
||||||
master_slave_test(send_all),
|
master_slave_test(send_all),
|
||||||
@ -233,8 +233,6 @@ mucsub_mam_slave(Config) ->
|
|||||||
gen_mod:update_module(Server, mod_mam, #{user_mucsub_from_muc_archive => true}),
|
gen_mod:update_module(Server, mod_mam, #{user_mucsub_from_muc_archive => true}),
|
||||||
|
|
||||||
Room = suite:muc_room_jid(Config),
|
Room = suite:muc_room_jid(Config),
|
||||||
MyJID = my_jid(Config),
|
|
||||||
MyJIDBare = jid:remove_resource(MyJID),
|
|
||||||
ok = mam_tests:set_default(Config, always),
|
ok = mam_tests:set_default(Config, always),
|
||||||
#presence{} = send_recv(Config, #presence{}),
|
#presence{} = send_recv(Config, #presence{}),
|
||||||
send(Config, #presence{type = unavailable}),
|
send(Config, #presence{type = unavailable}),
|
||||||
|
@ -119,7 +119,7 @@ xupdate_master(Config) ->
|
|||||||
sub_els = [#vcard_xupdate{hash = ImgHash}]} = recv_presence(Config),
|
sub_els = [#vcard_xupdate{hash = ImgHash}]} = recv_presence(Config),
|
||||||
#iq{type = result, sub_els = []} =
|
#iq{type = result, sub_els = []} =
|
||||||
send_recv(Config, #iq{type = set, sub_els = [#vcard_temp{}]}),
|
send_recv(Config, #iq{type = set, sub_els = [#vcard_temp{}]}),
|
||||||
?recv2(#presence{from = MyJID, type = available,
|
{_, _} = ?recv2(#presence{from = MyJID, type = available,
|
||||||
sub_els = [#vcard_xupdate{hash = undefined}]},
|
sub_els = [#vcard_xupdate{hash = undefined}]},
|
||||||
#presence{from = Peer, type = unavailable}),
|
#presence{from = Peer, type = unavailable}),
|
||||||
disconnect(Config).
|
disconnect(Config).
|
||||||
|
Loading…
Reference in New Issue
Block a user