Skip to content

Commit f80849f

Browse files
dcorbachodcorbacho
committed
Tests: Increase receive-after timeout in all mqtt test suites
1 parent 93aaebc commit f80849f

File tree

7 files changed

+113
-108
lines changed

7 files changed

+113
-108
lines changed

‎deps/rabbitmq_mqtt/test/auth_SUITE.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ setup_rabbit_auth_backend_mqtt_mock(Config) ->
672672
receive
673673
{ok, SP} -> SP
674674
after
675-
3000 -> ct:fail("timeout waiting for rabbit_auth_backend_mqtt_mock:setup/1")
675+
30_000 -> ct:fail("timeout waiting for rabbit_auth_backend_mqtt_mock:setup/1")
676676
end.
677677

678678
client_id_propagation(Config) ->
@@ -1333,6 +1333,6 @@ assert_connection_closed(ClientPid) ->
13331333
{'EXIT', ClientPid, {shutdown, tcp_closed}} ->
13341334
ok
13351335
after
1336-
2000 ->
1336+
30_000 ->
13371337
ct:fail("timed out waiting for exit message")
13381338
end.

‎deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
-define(RC_SERVER_SHUTTING_DOWN, 16#8B).
5454
-define(RC_KEEP_ALIVE_TIMEOUT, 16#8D).
5555
-define(RC_SESSION_TAKEN_OVER, 16#8E).
56+
-define(TIMEOUT, 30_000).
5657

5758
all() ->
5859
[{group, mqtt}].
@@ -738,28 +739,28 @@ pubsub(Config) ->
738739
receive {publish, #{client_pid := C1,
739740
qos := 1,
740741
payload := <<"m1">>}} -> ok
741-
after 1000 -> ct:fail("missing m1")
742+
after ?TIMEOUT -> ct:fail("missing m1")
742743
end,
743744

744745
ok = emqtt:publish(C0, Topic1, <<"m2">>, qos0),
745746
receive {publish, #{client_pid := C1,
746747
qos := 0,
747748
payload := <<"m2">>}} -> ok
748-
after 1000 -> ct:fail("missing m2")
749+
after ?TIMEOUT -> ct:fail("missing m2")
749750
end,
750751

751752
{ok, _} = emqtt:publish(C1, Topic0, <<"m3">>, qos1),
752753
receive {publish, #{client_pid := C0,
753754
qos := 1,
754755
payload := <<"m3">>}} -> ok
755-
after 1000 -> ct:fail("missing m3")
756+
after ?TIMEOUT -> ct:fail("missing m3")
756757
end,
757758

758759
ok = emqtt:publish(C1, Topic0, <<"m4">>, qos0),
759760
receive {publish, #{client_pid := C0,
760761
qos := 0,
761762
payload := <<"m4">>}} -> ok
762-
after 1000 -> ct:fail("missing m4")
763+
after ?TIMEOUT -> ct:fail("missing m4")
763764
end,
764765

765766
ok = emqtt:disconnect(C0),
@@ -1130,7 +1131,7 @@ many_qos1_messages(Config) ->
11301131
end, Payloads),
11311132
receive
11321133
proceed -> ok
1133-
after 30000 ->
1134+
after ?TIMEOUT ->
11341135
ct:fail("message to proceed never received")
11351136
end,
11361137
ok = expect_publishes(C, Topic, Payloads),
@@ -1383,7 +1384,7 @@ keepalive(Config) ->
13831384
retain := true,
13841385
topic := WillTopic,
13851386
payload := WillPayload}} -> ok
1386-
after 3000 -> ct:fail("missing will")
1387+
after ?TIMEOUT -> ct:fail("missing will")
13871388
end,
13881389
ok = emqtt:disconnect(C2).
13891390

@@ -1453,7 +1454,7 @@ session_switch(Config, Disconnect) ->
14531454
receive {publish, #{client_pid := C2,
14541455
payload := <<"m1">>,
14551456
qos := 0}} -> ok
1456-
after 1000 -> ct:fail("did not receive m1 with QoS 0")
1457+
after ?TIMEOUT -> ct:fail("did not receive m1 with QoS 0")
14571458
end,
14581459
%% New connection should be able to unsubscribe.
14591460
?assertMatch({ok, _, _}, emqtt:unsubscribe(C2, Topic)),
@@ -1521,7 +1522,7 @@ block_only_publisher(Config) ->
15211522
ok = expect_publishes(Sub, Topic, [<<"from Con 1">>]),
15221523
%% But now the new publisher should be blocked as well.
15231524
?assertEqual({error, ack_timeout}, emqtt:ping(Con)),
1524-
?assertEqual(puback_timeout, publish_qos1_timeout(Con, Topic, <<"from Con 2">>, 500)),
1525+
?assertEqual(puback_timeout, publish_qos1_timeout(Con, Topic, <<"from Con 2">>, 500),
15251526
?assertEqual(pong, emqtt:ping(Sub)),
15261527

15271528
rpc(Config, vm_memory_monitor, set_vm_memory_high_watermark, [0.6]),
@@ -1720,7 +1721,7 @@ max_packet_size_authenticated(Config) ->
17201721
v4 -> ok;
17211722
v5 -> ?assertMatch(#{'Maximum-Packet-Size' := MaxSize}, ConnAckProps),
17221723
receive {disconnected, _ReasonCodePacketTooLarge = 149, _Props} -> ok
1723-
after 1000 -> ct:fail("missing DISCONNECT packet from server")
1724+
after ?TIMEOUT -> ct:fail("missing DISCONNECT packet from server")
17241725
end
17251726
end,
17261727
ok = rpc(Config, persistent_term, put, [Key, OldMaxSize]).
@@ -1805,7 +1806,7 @@ incoming_message_interceptors(Config) ->
18051806
headers = [{<<"timestamp_in_ms">>, long, Millis} | _XHeaders]
18061807
}}} ->
18071808
ok
1808-
after 5000 -> ct:fail(missing_deliver)
1809+
after ?TIMEOUT -> ct:fail(missing_deliver)
18091810
end,
18101811

18111812
delete_queue(Ch, Stream),
@@ -1831,7 +1832,7 @@ retained_message_conversion(Config) ->
18311832
retain := true,
18321833
topic := Topic,
18331834
payload := Payload}} -> ok
1834-
after 1000 -> ct:fail("missing retained message")
1835+
after ?TIMEOUT -> ct:fail("missing retained message")
18351836
end,
18361837
ok = emqtt:publish(C, Topic, <<>>, [{retain, true}]),
18371838
ok = emqtt:disconnect(C).
@@ -1917,7 +1918,7 @@ await_confirms_ordered(From, N, To) ->
19171918
await_confirms_ordered(From, N + 1, To);
19181919
Got ->
19191920
ct:fail("Received unexpected message. Expected: ~p Got: ~p", [Expected, Got])
1920-
after 10_000 ->
1921+
after ?TIMEOUT ->
19211922
ct:fail("Did not receive expected message: ~p", [Expected])
19221923
end.
19231924

@@ -1929,7 +1930,7 @@ await_confirms_unordered(From, Left) ->
19291930
await_confirms_unordered(From, Left - 1);
19301931
Other ->
19311932
ct:fail("Received unexpected message: ~p", [Other])
1932-
after 10_000 ->
1933+
after ?TIMEOUT ->
19331934
ct:fail("~b confirms are missing", [Left])
19341935
end.
19351936

@@ -1976,6 +1977,6 @@ assert_v5_disconnect_reason_code(Config, ReasonCode) ->
19761977
v3 -> ok;
19771978
v4 -> ok;
19781979
v5 -> receive {disconnected, ReasonCode, _Props} -> ok
1979-
after 1000 -> ct:fail("missing DISCONNECT packet from server")
1980+
after ?TIMEOUT -> ct:fail("missing DISCONNECT packet from server")
19801981
end
19811982
end.

‎deps/rabbitmq_mqtt/test/protocol_interop_SUITE.erl‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
-include_lib("amqp10_common/include/amqp10_framing.hrl").
1919
-include_lib("rabbitmq_stomp/include/rabbit_stomp_frame.hrl").
2020

21+
-define(TIMEOUT, 30_000).
22+
2123
-import(util,
2224
[connect/2,
2325
connect/4]).
@@ -156,7 +158,7 @@ mqtt_amqpl_mqtt(Config) ->
156158
{<<"key">>, <<"val">>},
157159
{<<"rabbit🐇"/utf8>>, <<"carrot🥕"/utf8>>}],
158160
lists:sort(UserProperty1))
159-
after 1000 -> ct:fail("did not receive reply")
161+
after ?TIMEOUT -> ct:fail("did not receive reply")
160162
end,
161163

162164
%% Another message MQTT 5.0 to AMQP 0.9.1, this time with QoS 0
@@ -188,7 +190,7 @@ amqpl_mqtt_gh_12707(Config) ->
188190
payload := MqttPayload}} ->
189191
?assertEqual(Topic, MqttTopic),
190192
?assertEqual(Payload, MqttPayload)
191-
after 5000 ->
193+
after ?TIMEOUT ->
192194
ct:fail("did not receive a delivery")
193195
end,
194196

@@ -277,7 +279,7 @@ mqtt_amqp_mqtt(Config) ->
277279
{ok, Sender} = amqp10_client:attach_sender_link(
278280
Session2, SenderLinkName, ReplyToAddress, unsettled),
279281
receive {amqp10_event, {link, Sender, credited}} -> ok
280-
after 1000 -> ct:fail(credited_timeout)
282+
after ?TIMEOUT -> ct:fail(credited_timeout)
281283
end,
282284

283285
DTag = <<"my-dtag">>,
@@ -292,7 +294,7 @@ mqtt_amqp_mqtt(Config) ->
292294
Msg2 = amqp10_msg:set_headers(#{durable => True}, Msg2b),
293295
ok = amqp10_client:send_msg(Sender, Msg2),
294296
receive {amqp10_disposition, {accepted, DTag}} -> ok
295-
after 1000 -> ct:fail(settled_timeout)
297+
after ?TIMEOUT -> ct:fail(settled_timeout)
296298
end,
297299

298300
ok = amqp10_client:detach_link(Sender),
@@ -311,7 +313,7 @@ mqtt_amqp_mqtt(Config) ->
311313
'Subscription-Identifier' := 999}
312314
},
313315
MqttMsg)
314-
after 1000 -> ct:fail("did not receive reply")
316+
after ?TIMEOUT -> ct:fail("did not receive reply")
315317
end,
316318
ok = emqtt:disconnect(C).
317319

@@ -342,7 +344,7 @@ amqp_mqtt_amqp(Config) ->
342344
<<"sender">>,
343345
rabbitmq_amqp_address:exchange(<<"amq.topic">>, <<"t.1">>)),
344346
receive {amqp10_event, {link, Sender, credited}} -> ok
345-
after 2000 -> ct:fail(credited_timeout)
347+
after ?TIMEOUT -> ct:fail(credited_timeout)
346348
end,
347349
RequestBody = <<"my request">>,
348350

@@ -371,7 +373,7 @@ amqp_mqtt_amqp(Config) ->
371373
false ->
372374
ok
373375
end
374-
after 2000 -> ct:fail("did not receive request")
376+
after ?TIMEOUT -> ct:fail("did not receive request")
375377
end,
376378

377379
%% MQTT 5.0 to AMQP 1.0
@@ -420,7 +422,7 @@ amqp_mqtt(Qos, Config) ->
420422
<<"sender">>,
421423
rabbitmq_amqp_address:exchange(<<"amq.topic">>, <<"my.topic">>)),
422424
receive {amqp10_event, {link, Sender, credited}} -> ok
423-
after 2000 -> ct:fail(credited_timeout)
425+
after ?TIMEOUT -> ct:fail(credited_timeout)
424426
end,
425427

426428
%% single amqp-value section
@@ -463,28 +465,28 @@ amqp_mqtt(Qos, Config) ->
463465
false ->
464466
ok
465467
end
466-
after 5000 -> ct:fail({missing_publish, ?LINE})
468+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
467469
end,
468470
receive {publish, #{payload := Payload2}} ->
469471
?assertEqual([Body2], amqp10_framing:decode_bin(Payload2))
470-
after 5000 -> ct:fail({missing_publish, ?LINE})
472+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
471473
end,
472474
receive {publish, #{payload := Payload3}} ->
473475
?assertEqual(Body3, amqp10_framing:decode_bin(Payload3))
474-
after 5000 -> ct:fail({missing_publish, ?LINE})
476+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
475477
end,
476478
receive {publish, #{payload := Payload4}} ->
477479
?assertEqual(Body4, amqp10_framing:decode_bin(Payload4))
478-
after 5000 -> ct:fail({missing_publish, ?LINE})
480+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
479481
end,
480482
receive {publish, #{payload := Payload5}} ->
481483
?assertEqual(<<0, 255>>, Payload5)
482-
after 5000 -> ct:fail({missing_publish, ?LINE})
484+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
483485
end,
484486
receive {publish, #{payload := Payload6}} ->
485487
%% We expect that RabbitMQ concatenates the binaries of multiple data sections.
486488
?assertEqual(<<0, 1, 2, 3>>, Payload6)
487-
after 5000 -> ct:fail({missing_publish, ?LINE})
489+
after ?TIMEOUT -> ct:fail({missing_publish, ?LINE})
488490
end,
489491

490492
ok = emqtt:disconnect(C).
@@ -567,7 +569,7 @@ mqtt_stomp_mqtt(Config) ->
567569
'Correlation-Data' := Correlation,
568570
'User-Property' := UserProp}} = MqttMsg,
569571
?assert(lists:member({<<"x-key">>, <<"val4">>}, UserProp))
570-
after 1000 -> ct:fail("did not receive reply")
572+
after ?TIMEOUT -> ct:fail("did not receive reply")
571573
end,
572574

573575
ok = emqtt:disconnect(C).

‎deps/rabbitmq_mqtt/test/reader_SUITE.erl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ block_connack_timeout(Config) ->
109109
ClientMRef = monitor(process, Client),
110110
{error, connack_timeout} = emqtt:connect(Client),
111111
receive {'DOWN', ClientMRef, process, Client, connack_timeout} -> ok
112-
after 200 -> ct:fail("missing connack_timeout in client")
112+
after 30_000 -> ct:fail("missing connack_timeout in client")
113113
end,
114114

115115
MqttReader = rpc(Config, ?MODULE, mqtt_connection_pid, [Ports]),
@@ -122,7 +122,7 @@ block_connack_timeout(Config) ->
122122
%% We expect that MQTT reader process exits (without crashing)
123123
%% because our client already disconnected.
124124
ok
125-
after 2000 -> ct:fail("missing peername_not_known from server")
125+
after 30_000 -> ct:fail("missing peername_not_known from server")
126126
end,
127127
%% Ensure that our client is not registered.
128128
?assertEqual([], all_connection_pids(Config)),
@@ -331,6 +331,6 @@ num_received(Topic, Payload, N) ->
331331
{publish, #{topic := Topic,
332332
payload := Payload}} ->
333333
num_received(Topic, Payload, N + 1)
334-
after 1000 ->
334+
after 3000 ->
335335
N
336336
end.

‎deps/rabbitmq_mqtt/test/retainer_SUITE.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ recover_with_message_expiry_interval(Config) ->
213213
payload := <<"m1">>,
214214
properties := Props}}
215215
when map_size(Props) =:= 0 -> ok
216-
after 100 -> ct:fail("did not topic/1")
216+
after 30_000 -> ct:fail("did not topic/1")
217217
end,
218218

219219
receive {publish, #{client_pid := C2,
@@ -222,7 +222,7 @@ recover_with_message_expiry_interval(Config) ->
222222
payload := <<"m2">>,
223223
properties := #{'Message-Expiry-Interval' := MEI}}} ->
224224
assert_message_expiry_interval(100 - ElapsedSeconds2, MEI)
225-
after 100 -> ct:fail("did not topic/2")
225+
after 30_000 -> ct:fail("did not topic/2")
226226
end,
227227

228228
receive Unexpected -> ct:fail("Received unexpectedly: ~p", [Unexpected])

‎deps/rabbitmq_mqtt/test/util.erl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ expect_publishes(Client, Topic, [Payload|Rest])
6565
payload := Other}} ->
6666
ct:fail("Received unexpected PUBLISH payload. Expected: ~p Got: ~p",
6767
[Payload, Other])
68-
after 3000 ->
68+
after 30_000 ->
6969
{publish_not_received, Payload}
7070
end.
7171

@@ -120,14 +120,14 @@ await_exit(Pid) ->
120120
receive
121121
{'EXIT', Pid, _} -> ok
122122
after
123-
20_000 -> ct:fail({missing_exit, Pid})
123+
30_000 -> ct:fail({missing_exit, Pid})
124124
end.
125125

126126
await_exit(Pid, Reason) ->
127127
receive
128128
{'EXIT', Pid, Reason} -> ok
129129
after
130-
20_000 -> ct:fail({missing_exit, Pid})
130+
30_000 -> ct:fail({missing_exit, Pid})
131131
end.
132132

133133
%% "CleanStart=0 and SessionExpiry=0xFFFFFFFF (UINT_MAX) for

0 commit comments

Comments
 (0)