Skip to content

Commit 6e95613

Browse files
lukebakkenlukebakken
committed
Start adding assertions for successful BasicPublishAsync calls.
1 parent 513ff95 commit 6e95613

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

‎projects/Test/Applications/MassPublish/Program.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,16 @@ await consumeChannel.BasicConsumeAsync(queue: QueueName, autoAck: true, consumer
140140
using IChannel publishChannel = await publishConnection.CreateChannelAsync(new CreateChannelOptions { PublisherConfirmationsEnabled = true, PublisherConfirmationTrackingEnabled = true });
141141
publishChannel.ChannelShutdownAsync += Channel_ChannelShutdownAsync;
142142

143-
143+
bool ack = false;
144144
for (int i = 0; i < ItemsPerBatch; i++)
145145
{
146-
await publishChannel.BasicPublishAsync(exchange: ExchangeName, routingKey: RoutingKey,
146+
ack = await publishChannel.BasicPublishAsync(exchange: ExchangeName, routingKey: RoutingKey,
147147
basicProperties: s_properties, body: s_payload, mandatory: true);
148148
Interlocked.Increment(ref s_messagesSent);
149+
if (false == ack)
150+
{
151+
Console.Error.WriteLine("[ERROR] channel {0} saw nack!", publishChannel.ChannelNumber);
152+
}
149153
}
150154

151155
if (s_debug)

‎projects/Test/Integration/ConnectionRecovery/TestRpcAfterRecovery.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public async Task TestPublishRpcRightAfterReconnect()
7777

7878
try
7979
{
80-
await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: testQueueName,
81-
mandatory: false, basicProperties: properties, body: _messageBody);
80+
Assert.True(await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: testQueueName,
81+
mandatory: false, basicProperties: properties, body: _messageBody));
8282
}
8383
catch (Exception e)
8484
{

‎projects/Test/Integration/TestAsyncConsumer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ public async Task TestCloseWithinEventHandler_GH1567()
695695

696696
var bp = new BasicProperties();
697697

698-
await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: queueName,
699-
basicProperties: bp, mandatory: true, body: GetRandomBody(64));
698+
Assert.True(await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: queueName,
699+
basicProperties: bp, mandatory: true, body: GetRandomBody(64)));
700700

701701
Assert.True(await tcs.Task);
702702
}

‎projects/Test/Integration/TestAsyncEventingBasicConsumer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ public async Task TestAsyncEventingBasicConsumer_GH1038()
108108
await using IChannel publisherChannel = await _conn.CreateChannelAsync(new CreateChannelOptions { PublisherConfirmationsEnabled = true, PublisherConfirmationTrackingEnabled = true });
109109
byte[] messageBodyBytes = System.Text.Encoding.UTF8.GetBytes("Hello, world!");
110110
var props = new BasicProperties();
111-
await publisherChannel.BasicPublishAsync(exchange: exchangeName, routingKey: string.Empty,
112-
mandatory: false, basicProperties: props, body: messageBodyBytes);
111+
Assert.True(await publisherChannel.BasicPublishAsync(exchange: exchangeName, routingKey: string.Empty,
112+
mandatory: false, basicProperties: props, body: messageBodyBytes));
113113

114114
await Task.WhenAll(_onReceivedTcs.Task, _onCallbackExceptionTcs.Task);
115115
Assert.True(await _onReceivedTcs.Task);

‎projects/Test/Integration/TestBasicPublish.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public async Task TestBasicRoundtripArray()
7676
};
7777
string tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
7878

79-
await _channel.BasicPublishAsync("", q.QueueName, true, bp, sendBody);
79+
Assert.True(await _channel.BasicPublishAsync("", q.QueueName, true, bp, sendBody));
8080
bool waitRes = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5));
8181
await _channel.BasicCancelAsync(tag);
8282

@@ -131,7 +131,7 @@ public async Task TestBasicRoundtripReadOnlyMemory()
131131
};
132132
string tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
133133

134-
await _channel.BasicPublishAsync("", q.QueueName, new ReadOnlyMemory<byte>(sendBody));
134+
Assert.True(await _channel.BasicPublishAsync("", q.QueueName, new ReadOnlyMemory<byte>(sendBody)));
135135
bool waitRes = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(2));
136136
await _channel.BasicCancelAsync(tag);
137137

@@ -161,7 +161,7 @@ public async Task CanNotModifyPayloadAfterPublish()
161161
};
162162
string tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
163163

164-
await _channel.BasicPublishAsync("", q.QueueName, sendBody);
164+
Assert.True(await _channel.BasicPublishAsync("", q.QueueName, sendBody));
165165
sendBody.AsSpan().Fill(1);
166166

167167
Assert.True(await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5)));
@@ -247,7 +247,7 @@ public async Task TestMaxInboundMessageBodySize()
247247

248248
string tag = await channel.BasicConsumeAsync(q.QueueName, true, consumer);
249249

250-
await channel.BasicPublishAsync("", q.QueueName, msg0);
250+
Assert.True(await channel.BasicPublishAsync("", q.QueueName, msg0));
251251
AlreadyClosedException ex = await Assert.ThrowsAsync<AlreadyClosedException>(() =>
252252
channel.BasicPublishAsync("", q.QueueName, msg1).AsTask());
253253
Assert.IsType<MalformedFrameException>(ex.InnerException);
@@ -315,7 +315,7 @@ public async Task TestPropertiesRoundtrip_Headers()
315315
};
316316

317317
string tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
318-
await _channel.BasicPublishAsync("", q.QueueName, false, bp, sendBody);
318+
Assert.True(await _channel.BasicPublishAsync("", q.QueueName, false, bp, sendBody));
319319
bool waitResFalse = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5));
320320
await _channel.BasicCancelAsync(tag);
321321
Assert.True(waitResFalse);

‎projects/Test/Integration/TestConfirmSelect.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public async Task TestDeliveryTagDiverged_GH1043(ushort correlationIdLength)
7878

7979
var properties = new BasicProperties();
8080
// _output.WriteLine("Client delivery tag {0}", await _channel.GetNextPublishSequenceNumberAsync());
81-
await _channel.BasicPublishAsync(exchange: "sample", routingKey: string.Empty,
82-
mandatory: false, basicProperties: properties, body: body);
81+
Assert.True(await _channel.BasicPublishAsync(exchange: "sample", routingKey: string.Empty,
82+
mandatory: false, basicProperties: properties, body: body));
8383

8484
try
8585
{
@@ -88,7 +88,7 @@ await _channel.BasicPublishAsync(exchange: "sample", routingKey: string.Empty,
8888
CorrelationId = new string('o', correlationIdLength)
8989
};
9090
// _output.WriteLine("Client delivery tag {0}", await _channel.GetNextPublishSequenceNumberAsync());
91-
await _channel.BasicPublishAsync("sample", string.Empty, false, properties, body);
91+
Assert.True(await _channel.BasicPublishAsync("sample", string.Empty, false, properties, body));
9292
}
9393
catch
9494
{
@@ -97,7 +97,7 @@ await _channel.BasicPublishAsync(exchange: "sample", routingKey: string.Empty,
9797

9898
properties = new BasicProperties();
9999
// _output.WriteLine("Client delivery tag {0}", await _channel.GetNextPublishSequenceNumberAsync());
100-
await _channel.BasicPublishAsync("sample", string.Empty, false, properties, body);
100+
Assert.True(await _channel.BasicPublishAsync("sample", string.Empty, false, properties, body));
101101
// _output.WriteLine("I'm done...");
102102
}
103103
}

‎projects/Test/OAuth2/TestOAuth2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private async Task PublishAsync(IChannel publishChannel)
245245
AppId = "oauth2",
246246
};
247247

248-
await publishChannel.BasicPublishAsync(exchange: Exchange, routingKey: "hello", false, basicProperties: properties, body: body);
248+
Assert.True(await publishChannel.BasicPublishAsync(exchange: Exchange, routingKey: "hello", false, basicProperties: properties, body: body));
249249
_testOutputHelper.WriteLine("Sent and confirmed message");
250250
}
251251

0 commit comments

Comments
 (0)