Skip to content

Commit 6101e35

Browse files
michaelklishinmichaelklishin
committed
Naming
1 parent 0ec29e0 commit 6101e35

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎test/quorum_queue_SUITE.erl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,12 +1490,12 @@ subscribe_redelivery_count(Config) ->
14901490
wait_for_messages_pending_ack(Servers, RaName, 0),
14911491
subscribe(Ch, QQ, false),
14921492

1493-
DTag = <<"x-delivery-count">>,
1493+
DCHeader = <<"x-delivery-count">>,
14941494
receive
14951495
{#'basic.deliver'{delivery_tag = DeliveryTag,
14961496
redelivered = false},
14971497
#amqp_msg{props = #'P_basic'{headers = H0}}} ->
1498-
?assertMatch(undefined, rabbit_basic:header(DTag, H0)),
1498+
?assertMatch(undefined, rabbit_basic:header(DCHeader, H0)),
14991499
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
15001500
multiple = false,
15011501
requeue = true})
@@ -1505,7 +1505,7 @@ subscribe_redelivery_count(Config) ->
15051505
{#'basic.deliver'{delivery_tag = DeliveryTag1,
15061506
redelivered = true},
15071507
#amqp_msg{props = #'P_basic'{headers = H1}}} ->
1508-
?assertMatch({DTag, _, 1}, rabbit_basic:header(DTag, H1)),
1508+
?assertMatch({DCHeader, _, 1}, rabbit_basic:header(DCHeader, H1)),
15091509
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag1,
15101510
multiple = false,
15111511
requeue = true})
@@ -1515,7 +1515,7 @@ subscribe_redelivery_count(Config) ->
15151515
{#'basic.deliver'{delivery_tag = DeliveryTag2,
15161516
redelivered = true},
15171517
#amqp_msg{props = #'P_basic'{headers = H2}}} ->
1518-
?assertMatch({DTag, _, 2}, rabbit_basic:header(DTag, H2)),
1518+
?assertMatch({DCHeader, _, 2}, rabbit_basic:header(DCHeader, H2)),
15191519
amqp_channel:cast(Ch, #'basic.ack'{delivery_tag = DeliveryTag2,
15201520
multiple = false}),
15211521
wait_for_messages_ready(Servers, RaName, 0),
@@ -1535,12 +1535,12 @@ subscribe_redelivery_limit(Config) ->
15351535
wait_for_messages(Config, [[QQ, <<"1">>, <<"1">>, <<"0">>]]),
15361536
subscribe(Ch, QQ, false),
15371537

1538-
DTag = <<"x-delivery-count">>,
1538+
DCHeader = <<"x-delivery-count">>,
15391539
receive
15401540
{#'basic.deliver'{delivery_tag = DeliveryTag,
15411541
redelivered = false},
15421542
#amqp_msg{props = #'P_basic'{headers = H0}}} ->
1543-
?assertMatch(undefined, rabbit_basic:header(DTag, H0)),
1543+
?assertMatch(undefined, rabbit_basic:header(DCHeader, H0)),
15441544
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
15451545
multiple = false,
15461546
requeue = true})
@@ -1551,7 +1551,7 @@ subscribe_redelivery_limit(Config) ->
15511551
{#'basic.deliver'{delivery_tag = DeliveryTag1,
15521552
redelivered = true},
15531553
#amqp_msg{props = #'P_basic'{headers = H1}}} ->
1554-
?assertMatch({DTag, _, 1}, rabbit_basic:header(DTag, H1)),
1554+
?assertMatch({DCHeader, _, 1}, rabbit_basic:header(DCHeader, H1)),
15551555
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag1,
15561556
multiple = false,
15571557
requeue = true})
@@ -1581,12 +1581,12 @@ subscribe_redelivery_policy(Config) ->
15811581
wait_for_messages(Config, [[QQ, <<"1">>, <<"1">>, <<"0">>]]),
15821582
subscribe(Ch, QQ, false),
15831583

1584-
DTag = <<"x-delivery-count">>,
1584+
DCHeader = <<"x-delivery-count">>,
15851585
receive
15861586
{#'basic.deliver'{delivery_tag = DeliveryTag,
15871587
redelivered = false},
15881588
#amqp_msg{props = #'P_basic'{headers = H0}}} ->
1589-
?assertMatch(undefined, rabbit_basic:header(DTag, H0)),
1589+
?assertMatch(undefined, rabbit_basic:header(DCHeader, H0)),
15901590
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
15911591
multiple = false,
15921592
requeue = true})
@@ -1597,7 +1597,7 @@ subscribe_redelivery_policy(Config) ->
15971597
{#'basic.deliver'{delivery_tag = DeliveryTag1,
15981598
redelivered = true},
15991599
#amqp_msg{props = #'P_basic'{headers = H1}}} ->
1600-
?assertMatch({DTag, _, 1}, rabbit_basic:header(DTag, H1)),
1600+
?assertMatch({DCHeader, _, 1}, rabbit_basic:header(DCHeader, H1)),
16011601
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag1,
16021602
multiple = false,
16031603
requeue = true})
@@ -1631,12 +1631,12 @@ subscribe_redelivery_limit_with_dead_letter(Config) ->
16311631
wait_for_messages(Config, [[QQ, <<"1">>, <<"1">>, <<"0">>]]),
16321632
subscribe(Ch, QQ, false),
16331633

1634-
DTag = <<"x-delivery-count">>,
1634+
DCHeader = <<"x-delivery-count">>,
16351635
receive
16361636
{#'basic.deliver'{delivery_tag = DeliveryTag,
16371637
redelivered = false},
16381638
#amqp_msg{props = #'P_basic'{headers = H0}}} ->
1639-
?assertMatch(undefined, rabbit_basic:header(DTag, H0)),
1639+
?assertMatch(undefined, rabbit_basic:header(DCHeader, H0)),
16401640
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
16411641
multiple = false,
16421642
requeue = true})
@@ -1647,7 +1647,7 @@ subscribe_redelivery_limit_with_dead_letter(Config) ->
16471647
{#'basic.deliver'{delivery_tag = DeliveryTag1,
16481648
redelivered = true},
16491649
#amqp_msg{props = #'P_basic'{headers = H1}}} ->
1650-
?assertMatch({DTag, _, 1}, rabbit_basic:header(DTag, H1)),
1650+
?assertMatch({DCHeader, _, 1}, rabbit_basic:header(DCHeader, H1)),
16511651
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag1,
16521652
multiple = false,
16531653
requeue = true})
@@ -1668,14 +1668,14 @@ consume_redelivery_count(Config) ->
16681668
wait_for_messages_ready(Servers, RaName, 1),
16691669
wait_for_messages_pending_ack(Servers, RaName, 0),
16701670

1671-
DTag = <<"x-delivery-count">>,
1671+
DCHeader = <<"x-delivery-count">>,
16721672

16731673
{#'basic.get_ok'{delivery_tag = DeliveryTag,
16741674
redelivered = false},
16751675
#amqp_msg{props = #'P_basic'{headers = H0}}} =
16761676
amqp_channel:call(Ch, #'basic.get'{queue = QQ,
16771677
no_ack = false}),
1678-
?assertMatch({DTag, _, 0}, rabbit_basic:header(DTag, H0)),
1678+
?assertMatch({DCHeader, _, 0}, rabbit_basic:header(DCHeader, H0)),
16791679
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
16801680
multiple = false,
16811681
requeue = true}),
@@ -1687,7 +1687,7 @@ consume_redelivery_count(Config) ->
16871687
#amqp_msg{props = #'P_basic'{headers = H1}}} =
16881688
amqp_channel:call(Ch, #'basic.get'{queue = QQ,
16891689
no_ack = false}),
1690-
?assertMatch({DTag, _, 1}, rabbit_basic:header(DTag, H1)),
1690+
?assertMatch({DCHeader, _, 1}, rabbit_basic:header(DCHeader, H1)),
16911691
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag1,
16921692
multiple = false,
16931693
requeue = true}),
@@ -1697,7 +1697,7 @@ consume_redelivery_count(Config) ->
16971697
#amqp_msg{props = #'P_basic'{headers = H2}}} =
16981698
amqp_channel:call(Ch, #'basic.get'{queue = QQ,
16991699
no_ack = false}),
1700-
?assertMatch({DTag, _, 2}, rabbit_basic:header(DTag, H2)),
1700+
?assertMatch({DCHeader, _, 2}, rabbit_basic:header(DCHeader, H2)),
17011701
amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag2,
17021702
multiple = false,
17031703
requeue = true}),

0 commit comments

Comments
 (0)