* Re-enable toxiproxy tests

* Remove max outstanding confirms check, because that is what is causing issues right now.

Author: lukebakken

.github/workflows/build-test.yaml

@@ -69,14 +69,14 @@ jobs:
       - name: Integration Tests
         timeout-minutes: 25
         run: |
-          # $tx = Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" }; `
-          # Start-Sleep -Seconds 1; `
-          # Receive-Job -Job $tx; `
-          # & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-cli.exe" list; `
+          $tx = Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" }; `
+          Start-Sleep -Seconds 1; `
+          Receive-Job -Job $tx; `
+          & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-cli.exe" list; `
           dotnet test `
             --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' `
             --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
-            --environment 'RABBITMQ_TOXIPROXY_TESTS=false' `
+            --environment 'RABBITMQ_TOXIPROXY_TESTS=true' `
             --environment 'PASSWORD=grapefruit' `
             --environment SSL_CERTS_DIR="${{ github.workspace }}\.ci\certs" `
             "${{ github.workspace }}\projects\Test\Integration\Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
@@ -185,14 +185,14 @@ jobs:
           path: projects
       - name: Start RabbitMQ
         id: start-rabbitmq
-        run: ${{ github.workspace }}/.ci/ubuntu/gha-setup.sh no-toxiproxy
+        run: ${{ github.workspace }}/.ci/ubuntu/gha-setup.sh toxiproxy
       - name: Integration Tests
         timeout-minutes: 15
         run: |
             dotnet test \
                 --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' \
                 --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:${{ steps.start-rabbitmq.outputs.id }}" \
-                --environment 'RABBITMQ_TOXIPROXY_TESTS=false' \
+                --environment 'RABBITMQ_TOXIPROXY_TESTS=true' \
                 --environment 'PASSWORD=grapefruit' \
                 --environment SSL_CERTS_DIR="${{ github.workspace }}/.ci/certs" \
                 "${{ github.workspace }}/projects/Test/Integration/Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'

projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs

@@ -282,17 +282,16 @@ await _confirmSemaphore.WaitAsync(reason.CancellationToken)
         {
             if (_publisherConfirmationsEnabled)
             {
+                /*
                 if (_publisherConfirmationTrackingEnabled)
                 {
-                    if (_maxOutstandingPublisherConfirmations is not null)
+                    if (_maxOutstandingConfirmationsSemaphore is not null)
                     {
-                        int percentOfMax = _confirmsTaskCompletionSources.Count / (int)_maxOutstandingPublisherConfirmations;
-                        if (percentOfMax > 0.5)
-                        {
-                            await Task.Delay(1000 * percentOfMax).ConfigureAwait(false);
-                        }
+                        await _maxOutstandingConfirmationsSemaphore.WaitAsync(cancellationToken)
+                            .ConfigureAwait(false);
                     }
                 }
+                */
 
                 await _confirmSemaphore.WaitAsync(cancellationToken)
                     .ConfigureAwait(false);
@@ -304,12 +303,6 @@ await _confirmSemaphore.WaitAsync(cancellationToken)
                 {
                     publisherConfirmationTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
                     _confirmsTaskCompletionSources[publishSequenceNumber] = publisherConfirmationTcs;
-
-                    if (_maxOutstandingConfirmationsSemaphore is not null)
-                    {
-                        await _maxOutstandingConfirmationsSemaphore.WaitAsync(cancellationToken)
-                            .ConfigureAwait(false);
-                    }
                 }
 
                 _nextPublishSeqNo++;
@@ -361,7 +354,7 @@ await publisherConfirmationInfo.MaybeWaitForConfirmationAsync(cancellationToken)
                 if (_publisherConfirmationTrackingEnabled &&
                     _maxOutstandingConfirmationsSemaphore is not null)
                 {
-                    _maxOutstandingConfirmationsSemaphore.Release();
+                    // _maxOutstandingConfirmationsSemaphore.Release();
                 }
             }
         }