Toxiproxy manager change

* Use `Guid.NewGuid` to ensure unique name * No need to delete first as names should be unique
rabbitmq · Dec 11, 2024 · 0c2ee5b · 0c2ee5b
1 parent 103c39e
commit 0c2ee5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -69,19 +69,17 @@ jobs:
       - name: Integration Tests
         timeout-minutes: 25
         run: |
-          Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" }; `
+          Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" | Out-File -LiteralPath $env:APPDATA\RabbitMQ\log\toxiproxy-log.txt }; `
           dotnet test `
             --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' `
             --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
             --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'
+            "${{ github.workspace }}\projects\Test\Integration\Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'; `
+          Get-Job | Stop-Job -Verbose -PassThru | Remove-Job -Verbose
       - name: Check for errors in RabbitMQ logs
         run: ${{ github.workspace }}\.ci\windows\gha-log-check.ps1
-      - name: Maybe collect Toxiproxy logs
-        if: failure()
-        run: Get-Job | Where-Object { $_.HasMoreData } | Receive-Job | Out-File -Append -LiteralPath $env:APPDATA\RabbitMQ\log\toxiproxy-log.txt
       - name: Maybe upload RabbitMQ and Toxiproxy logs
         if: failure()
         uses: actions/upload-artifact@v4

diff --git a/projects/Test/Integration/ToxiproxyManager.cs b/projects/Test/Integration/ToxiproxyManager.cs
@@ -34,11 +34,6 @@ public ToxiproxyManager(string testDisplayName, bool isRunningInCI, bool isWindo
 
             _proxyPort = Interlocked.Increment(ref s_proxyPort);
 
-            /*
-            string now = DateTime.UtcNow.ToString("o", System.Globalization.CultureInfo.InvariantCulture);
-            Console.WriteLine("{0} [DEBUG] {1} _proxyPort {2}", now, testDisplayName, _proxyPort);
-            */
-
             _proxyConnection = new Connection(resetAllToxicsAndProxiesOnClose: true);
             _proxyClient = _proxyConnection.Client();
 
@@ -70,17 +65,9 @@ public ToxiproxyManager(string testDisplayName, bool isRunningInCI, bool isWindo
 
         public async Task InitializeAsync()
         {
-            string proxyName = $"{ProxyNamePrefix}-{_testDisplayName}-{Util.Now}-{Util.GenerateShortUuid()}";
+            string proxyName = $"{ProxyNamePrefix}-{_testDisplayName}-{Util.Now}-{Guid.NewGuid()}";
             _proxy.Name = proxyName;
 
-            try
-            {
-                await _proxyClient.DeleteAsync(_proxy);
-            }
-            catch
-            {
-            }
-
             ushort retryCount = 5;
             do
             {