Skip to content

Commit 85ed24b

Browse files
NelsonVidesNelsonVides
committed
Introduce wait_helper and remove duplicated coded helper
1 parent d8bb43d commit 85ed24b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+257
-358
lines changed

‎big_tests/rebar.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
{rabbit_common, "3.13.4"},
2323
{esip, "1.0.52"},
2424
{jid, "2.1.0", {pkg, mongoose_jid}},
25-
{ct_groups_summary_hook, "0.1.1"}
25+
{ct_groups_summary_hook, "0.1.1"},
26+
{wait_helper, "0.2.1"}
2627
]}.

‎big_tests/rebar.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
{<<"stun">>,{pkg,<<"stun">>,<<"1.2.12">>},1},
3333
{<<"thoas">>,{pkg,<<"thoas">>,<<"1.0.0">>},1},
3434
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
35+
{<<"wait_helper">>,{pkg,<<"wait_helper">>,<<"0.2.1">>},0},
3536
{<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.2.1">>},1}]}.
3637
[
3738
{pkg_hash,[
@@ -64,6 +65,7 @@
6465
{<<"stun">>, <<"A65DF67A8AAAECB6A94D687977B2E9F161820819910CB97BBE26A3525356525B">>},
6566
{<<"thoas">>, <<"567C03902920827A18A89F05B79A37B5BF93553154B883E0131801600CF02CE0">>},
6667
{<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
68+
{<<"wait_helper">>, <<"942967D8B84A2F62DC13F57C7F1B3182D0DA8D3F8D2B4210E85427E12164D8FF">>},
6769
{<<"worker_pool">>, <<"BD98A0BE1D20057AE9967CBE73D263AEA5BE14BBE4C73CAFEB1378572FF14561">>}]},
6870
{pkg_hash_ext,[
6971
{<<"amqp_client">>, <<"E86FD4B95291799BDE1571AF81077B5A5DB9653824FBE429F5BADAD831C52642">>},
@@ -95,5 +97,6 @@
9597
{<<"stun">>, <<"A2055032B6D338D0454142004BCB12FAFB0C64AB1F273F1D0C6923EBBC8EDE40">>},
9698
{<<"thoas">>, <<"FC763185B932ECB32A554FB735EE03C3B6B1B31366077A2427D2A97F3BD26735">>},
9799
{<<"uuid">>, <<"4E4C5CA3461DC47C5E157ED42AA3981A053B7A186792AF972A27B14A9489324E">>},
100+
{<<"wait_helper">>, <<"88FCA7983E1E8A0650FD98062C273E67E807F072C0046C2B102A53FDF467DEEC">>},
98101
{<<"worker_pool">>, <<"64E560DE08CA5E7DB8BD4CDCC7B744B0659696194E3BC9E56239BA4A0F7E24F9">>}]}
99102
].

‎big_tests/run_common_test.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ block_node(Name, BlockName, Props) ->
785785
rpc_call(Node, erlang, set_cookie, [BlockNode, make_bad_cookie(Name, BlockNode)]),
786786
rpc_call(Node, erlang, disconnect_node, [BlockNode]),
787787
Cond = fun() -> lists:member(BlockNode, rpc_call(Node, erlang, nodes, [])) end,
788-
mongoose_helper:wait_until(Cond, false).
788+
wait_helper:wait_until(Cond, false).
789789

790790
unblock_node(Name, BlockName, Props) ->
791791
Node = host_name_to_node(Name, Props),

‎big_tests/tests/amp_big_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ wait_until_no_session(FreshConfig, User) ->
736736
U = escalus_users:get_username(FreshConfig, User),
737737
S = escalus_users:get_server(FreshConfig, User),
738738
JID = jid:make(U, S, <<>>),
739-
mongoose_helper:wait_until(
739+
wait_helper:wait_until(
740740
fun() -> rpc(mim(), ejabberd_sm, get_user_resources, [JID]) end, []).
741741

742742
user_has_no_incoming_offline_messages(FreshConfig, UserName) ->

‎big_tests/tests/anonymous_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ connection_is_registered_with_sasl_anon(Config) ->
7575
F = fun() -> rpc(mim(), ejabberd_auth, does_user_exist, [JID]) end,
7676
true = F(),
7777
escalus_connection:kill(Jon),
78-
mongoose_helper:wait_until(F, false),
78+
wait_helper:wait_until(F, false),
7979
assert_event(auth_anonymous_unregister_user, JID)
8080
end).
8181

@@ -88,7 +88,7 @@ connection_is_registered_with_login(Config) ->
8888
F = fun() -> rpc(mim(), ejabberd_auth, does_user_exist, [JID]) end,
8989
true = F(),
9090
escalus_connection:kill(Anna),
91-
mongoose_helper:wait_until(F, false),
91+
wait_helper:wait_until(F, false),
9292
assert_event(auth_anonymous_unregister_user, JID)
9393
end).
9494

‎big_tests/tests/bosh_SUITE.erl

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -915,41 +915,41 @@ wait_for_session_close(Sid) ->
915915
wait_for_session_close(Sid, ?INACTIVITY).
916916

917917
wait_for_session_close(Sid, LeftTime) ->
918-
mongoose_helper:wait_until(fun() -> is_session_alive(Sid) end, false,
919-
#{
920-
time_left => timer:seconds(10),
921-
time_sleep => LeftTime,
922-
name => is_session_alive
923-
}).
918+
wait_helper:wait_until(fun() -> is_session_alive(Sid) end, false,
919+
#{
920+
time_left => timer:seconds(10),
921+
time_sleep => LeftTime,
922+
name => is_session_alive
923+
}).
924924

925925
wait_for_handler(Pid, Count) ->
926-
mongoose_helper:wait_until(fun() -> length(get_handlers(Pid)) end, Count,
927-
#{
928-
time_left => timer:seconds(10),
929-
time_sleep => timer:seconds(1),
930-
name => get_handlers
931-
}).
926+
wait_helper:wait_until(fun() -> length(get_handlers(Pid)) end, Count,
927+
#{
928+
time_left => timer:seconds(10),
929+
time_sleep => timer:seconds(1),
930+
name => get_handlers
931+
}).
932932

933933

934934
wait_for_handler(Pid, Count, LeftTime) ->
935-
mongoose_helper:wait_until(fun() -> length(get_handlers(Pid)) end, Count,
936-
#{
937-
time_left => LeftTime,
938-
time_sleep => timer:seconds(1),
939-
name => get_handlers
940-
}).
935+
wait_helper:wait_until(fun() -> length(get_handlers(Pid)) end, Count,
936+
#{
937+
time_left => LeftTime,
938+
time_sleep => timer:seconds(1),
939+
name => get_handlers
940+
}).
941941

942942
wait_until_user_has_no_stanzas(User) ->
943-
mongoose_helper:wait_until(fun() ->
944-
escalus_assert:has_no_stanzas(User)
945-
end, ok, #{left_time => 2 * timer:seconds(?INACTIVITY)}).
943+
wait_helper:wait_until(fun() ->
944+
escalus_assert:has_no_stanzas(User)
945+
end, ok, #{left_time => 2 * timer:seconds(?INACTIVITY)}).
946946

947947
wait_for_zero_bosh_sessions() ->
948-
mongoose_helper:wait_until(fun() ->
949-
get_bosh_sessions()
950-
end,
951-
[],
952-
#{name => get_bosh_sessions}).
948+
wait_helper:wait_until(fun() ->
949+
get_bosh_sessions()
950+
end,
951+
[],
952+
#{name => get_bosh_sessions}).
953953

954954
instrumentation_events() ->
955955
instrument_helper:declared_events(mod_bosh, [])

‎big_tests/tests/component_helper.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ disconnect_component(Component, Addr) ->
4545
disconnect_components(Components, Addr) ->
4646
%% TODO replace 'kill' with 'stop' when server supports stream closing
4747
[escalus_connection:kill(Component) || Component <- Components],
48-
mongoose_helper:wait_until(fun() -> rpc(mongoose_component, lookup_component, [Addr]) =:= [] end, true,
49-
#{name => rpc}).
48+
wait_helper:wait_until(fun() -> rpc(mongoose_component, lookup_component, [Addr]) =:= [] end, true,
49+
#{name => rpc}).
5050

5151
rpc(M, F, A) ->
5252
Node = ct:get_config({hosts, mim, node}),

‎big_tests/tests/connect_SUITE.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ same_resource_replaces_session(Config) ->
542542
ConflictError = escalus:wait_for_stanza(Alice1),
543543
escalus:assert(is_stream_error, [<<"conflict">>, <<>>], ConflictError),
544544

545-
mongoose_helper:wait_until(fun() -> escalus_connection:is_connected(Alice1) end, false),
545+
wait_helper:wait_until(fun() -> escalus_connection:is_connected(Alice1) end, false),
546546

547547
escalus_connection:stop(Alice2).
548548

@@ -572,7 +572,7 @@ replaced_session_cannot_terminate(Config) ->
572572
FilterFun = fun(_, Msg) ->
573573
re:run(Msg, "replaced_wait_timeout") /= nomatch
574574
end,
575-
mongoose_helper:wait_until(
575+
wait_helper:wait_until(
576576
fun() -> length(logger_ct_backend:recv(FilterFun)) end, 1),
577577

578578
rpc(mim(), sys, resume, [C2SPid]),
@@ -596,7 +596,7 @@ replaced_session_cannot_terminate_different_nodes(Config) ->
596596
FilterFun = fun(_, Msg) ->
597597
re:run(Msg, "replaced_wait_timeout") /= nomatch
598598
end,
599-
mongoose_helper:wait_until(
599+
wait_helper:wait_until(
600600
fun() -> length(logger_ct_backend:recv(FilterFun)) end, 1),
601601

602602
rpc(mim(), sys, resume, [C2SPid]),

‎big_tests/tests/domain_removal_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ offline_removal(Config) ->
339339
% wait until message is stored
340340
BobJid = jid:from_binary(escalus_client:full_jid(Bob)),
341341
{LUser, LServer} = jid:to_lus(BobJid),
342-
mongoose_helper:wait_until(
342+
wait_helper:wait_until(
343343
fun() -> mongoose_helper:total_offline_messages({LUser, LServer}) end, 1),
344344
% check messages in DB
345345
?assertMatch({ok, [_]}, rpc(mim(), mod_offline_rdbms, fetch_messages, [host_type(), BobJid])),
@@ -357,7 +357,7 @@ markers_removal(Config) ->
357357
ChatMarker = escalus_stanza:chat_marker(Alice, <<"displayed">>, MsgId),
358358
escalus:send(Bob, ChatMarker),
359359
escalus:wait_for_stanza(Alice),
360-
mongoose_helper:wait_until(
360+
wait_helper:wait_until(
361361
fun() -> 1 =< mongoose_helper:generic_count(mod_smart_markers) end, true),
362362
% check messages in DB
363363
AliceJid = jid:from_binary(escalus_client:full_jid(Alice)),

‎big_tests/tests/gdpr_SUITE.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ retrieve_offline(Config) ->
947947
%% Well, jid_to_lower works for any binary :)
948948
AliceU = escalus_utils:jid_to_lower(escalus_client:username(Alice)),
949949
AliceS = escalus_utils:jid_to_lower(escalus_client:server(Alice)),
950-
mongoose_helper:wait_until(
950+
wait_helper:wait_until(
951951
fun() ->
952952
mongoose_helper:successful_rpc(mod_offline_backend, count_offline_messages,
953953
[host_type(), AliceU, AliceS, 10])
@@ -982,7 +982,7 @@ remove_offline(Config) ->
982982
%% Well, jid_to_lower works for any binary :)
983983
AliceU = escalus_utils:jid_to_lower(escalus_client:username(Alice)),
984984
AliceS = escalus_utils:jid_to_lower(escalus_client:server(Alice)),
985-
mongoose_helper:wait_until(
985+
wait_helper:wait_until(
986986
fun() ->
987987
mongoose_helper:successful_rpc(mod_offline_backend, count_offline_messages,
988988
[host_type(), AliceU, AliceS, 10])
@@ -1558,7 +1558,7 @@ assert_personal_data_via_rpc(Client, ExpectedPersonalDataEntries) ->
15581558
%% We use wait_until here, because e.g. the deletion in ElasticSearch
15591559
%% sometimes is applied with a delay (i.e. immediately after successful deletion
15601560
%% the data retrieval still returned valid entries)
1561-
mongoose_helper:wait_until(
1561+
wait_helper:wait_until(
15621562
fun() ->
15631563
get_personal_data_via_rpc(Client, ExpectedKeys)
15641564
end, ExpectedPersonalDataEntries).

0 commit comments

Comments
 (0)