YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-26 16:24:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unit Tests.

Browse Source
This commit is contained in:
Christian
2020-11-15 14:17:18 +01:00
parent 0bc25571e0
commit 02ab0e4903
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs
+2
View File
@@ -201,7 +201,9 @@ namespace MQTTnet.Extensions.WebSocket4Net
_webSocket.Opened += SuccessHandler; _webSocket.Opened += SuccessHandler;
_webSocket.Error += ErrorHandler; _webSocket.Error += ErrorHandler;
#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
_webSocket.Open(); _webSocket.Open();
#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
var exception = await MqttTaskTimeout.WaitAsync(c => var exception = await MqttTaskTimeout.WaitAsync(c =>
{ {
Source/MQTTnet/Client/MqttClient.cs
+4 -7
View File
@@ -142,12 +142,14 @@ namespace MQTTnet.Client
ThrowIfDisposed(); ThrowIfDisposed();
var disconnectIsPending = DisconnectIsPending();
try try
{ {
_disconnectReason = MqttClientDisconnectReason.NormalDisconnection; _disconnectReason = MqttClientDisconnectReason.NormalDisconnection;
_cleanDisconnectInitiated = true; _cleanDisconnectInitiated = true;
if (IsConnected) if (!disconnectIsPending && _isConnected)
{ {
var disconnectPacket = _adapter.PacketFormatterAdapter.DataConverter.CreateDisconnectPacket(options); var disconnectPacket = _adapter.PacketFormatterAdapter.DataConverter.CreateDisconnectPacket(options);
await SendAsync(disconnectPacket, cancellationToken).ConfigureAwait(false); await SendAsync(disconnectPacket, cancellationToken).ConfigureAwait(false);
@@ -155,7 +157,7 @@ namespace MQTTnet.Client
} }
finally finally
{ {
if (!DisconnectIsPending()) if (!disconnectIsPending)
{ {
await DisconnectInternalAsync(null, null, null).ConfigureAwait(false); await DisconnectInternalAsync(null, null, null).ConfigureAwait(false);
} }
@@ -364,11 +366,6 @@ namespace MQTTnet.Client
{ {
try try
{ {
if (_backgroundCancellationTokenSource?.IsCancellationRequested == true)
{
return;
}
_backgroundCancellationTokenSource?.Cancel(false); _backgroundCancellationTokenSource?.Cancel(false);
} }
catch (Exception exception) catch (Exception exception)
Tests/MQTTnet.Core.Tests/Server_Tests.cs
+2 -2
View File
@@ -1302,7 +1302,7 @@ namespace MQTTnet.Tests
} }
} }
private static async Task TestPublishAsync( static async Task TestPublishAsync(
string topic, string topic,
MqttQualityOfServiceLevel qualityOfServiceLevel, MqttQualityOfServiceLevel qualityOfServiceLevel,
string topicFilter, string topicFilter,
@@ -1314,7 +1314,7 @@ namespace MQTTnet.Tests
{ {
var receivedMessagesCount = 0; var receivedMessagesCount = 0;
await testEnvironment.StartServerAsync(new MqttServerOptionsBuilder()); await testEnvironment.StartServerAsync();
var c1 = await testEnvironment.ConnectClientAsync(new MqttClientOptionsBuilder().WithClientId("receiver")); var c1 = await testEnvironment.ConnectClientAsync(new MqttClientOptionsBuilder().WithClientId("receiver"));
c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount)); c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));