Update ToxiProxy and Pulsar images and adjust timeout intervals

The commit updates the used images of ToxiProxy and Pulsar in tests from versions 2.7.0 and 3.1.3 to 2.9.0 and 3.2.3 respectively to keep up with the latest versions. Also, it introduces longer timeout intervals in the PulsarClientTests, changing them from 10 seconds to 2 hours for more reliable results. Finally, it improves task cancellation functionality in ConnectionPool for more robust error handling.
apache · May 27, 2024 · 15eb3fe · 15eb3fe
1 parent 7577aa6
commit 15eb3fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/DotPulsar/Internal/ConnectionPool.cs b/src/DotPulsar/Internal/ConnectionPool.cs
@@ -152,7 +152,7 @@ private async Task<Connection> EstablishNewConnection(PulsarUrl url, Cancellatio
             commandConnect = WithProxyToBroker(commandConnect, url.Logical);
 
         var connection = Connection.Connect(new PulsarStream(stream), _authentication, _keepAliveInterval, _closeInactiveConnectionsInterval);
-        _ = connection.OnStateChangeFrom(ConnectionState.Connected, CancellationToken.None).AsTask().ContinueWith(t => DisposeConnection(url, connection));
+        _ = connection.OnStateChangeFrom(ConnectionState.Connected, CancellationToken.None).AsTask().ContinueWith(t => DisposeConnection(url, connection), cancellationToken);
         var response = await connection.Send(commandConnect, cancellationToken).ConfigureAwait(false);
         response.Expect(BaseCommand.Type.Connected);
         _connections[url] = connection;

diff --git a/tests/DotPulsar.Tests/IntegrationFixture.cs b/tests/DotPulsar.Tests/IntegrationFixture.cs
@@ -69,7 +69,7 @@ public IntegrationFixture(IMessageSink messageSink)
             .Build();
 
         _toxiProxy = new ContainerBuilder()
-            .WithImage("ghcr.io/shopify/toxiproxy:2.7.0")
+            .WithImage("ghcr.io/shopify/toxiproxy:2.9.0")
             .WithPortBinding(ToxiProxyControlPort, true)
             .WithPortBinding(ToxiProxyPort, true)
             .WithHostname("toxiproxy")
@@ -78,7 +78,7 @@ public IntegrationFixture(IMessageSink messageSink)
             .Build();
 
         _pulsarCluster = new ContainerBuilder()
-            .WithImage("apachepulsar/pulsar:3.1.3")
+            .WithImage("apachepulsar/pulsar:3.2.3")
             .WithEnvironment(environmentVariables)
             .WithHostname("pulsar")
             .WithNetwork(_network)

diff --git a/tests/DotPulsar.Tests/PulsarClientTests.cs b/tests/DotPulsar.Tests/PulsarClientTests.cs
@@ -58,7 +58,7 @@ public async Task TokenSupplier_WhenTokenSupplierThrowsAnExceptionOnAuthChalleng
         {
             if (throwException)
                 throw new Exception();
-            var token = await _fixture.CreateToken(TimeSpan.FromSeconds(10), _cts.Token);
+            var token = await _fixture.CreateToken(TimeSpan.FromHours(2), _cts.Token);
             _testOutputHelper.Log($"Received token: '{token}'");
             return token;
         });
@@ -109,7 +109,7 @@ public async Task TokenSupplier_WhenTokenSupplierReturnValidToken_ShouldStayConn
             if (refreshCount == 3)
                 tcs.SetResult();
 
-            var token = await _fixture.CreateToken(TimeSpan.FromSeconds(10), _cts.Token);
+            var token = await _fixture.CreateToken(TimeSpan.FromHours(2), _cts.Token);
             _testOutputHelper.Log($"Received token: '{token}'");
             return token;
         });