Fix test timeout_during_authentication (#6388)

vonzshik · web-flow · commit 8cf2fa6b3aa4 · 2025-12-27T08:49:30.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -301,10 +301,19 @@ jobs:
       # TODO: Once test/Npgsql.Specification.Tests work, switch to just testing on the solution
       - name: Test
         run: |
-            dotnet test -c ${{ matrix.config }} -f ${{ matrix.test_tfm }} test/Npgsql.Tests --logger "GitHubActions;report-warnings=false" --blame-hang-timeout 30s
+            dotnet test -c ${{ matrix.config }} -f ${{ matrix.test_tfm }} test/Npgsql.Tests --logger "GitHubActions;report-warnings=false" --blame-crash --blame-hang-timeout 30s
             dotnet test -c ${{ matrix.config }} -f ${{ matrix.test_tfm }} test/Npgsql.DependencyInjection.Tests --logger "GitHubActions;report-warnings=false"
         shell: bash
 
+      - name: Upload Test Hang Dumps
+        uses: actions/upload-artifact@v6
+        if: failure()
+        with:
+          name: test-hang-dumps
+          path: |
+            **/*.dmp
+            **/Sequence*.xml
+
       - name: Test Plugins
         if: "!startsWith(matrix.os, 'macos')"
         run: |
diff --git a/src/Npgsql/Internal/NpgsqlConnector.cs b/src/Npgsql/Internal/NpgsqlConnector.cs
@@ -1339,7 +1339,7 @@ async Task ConnectAsync(NpgsqlTimeout timeout, CancellationToken cancellationTok
         }
         else
         {
-            IPAddress[] ipAddresses;
+            IPAddress[] ipAddresses = [];
             try
             {
                 using var combinedCts = timeout.IsSet ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken) : null;
@@ -1352,7 +1352,8 @@ async Task ConnectAsync(NpgsqlTimeout timeout, CancellationToken cancellationTok
                 catch (OperationCanceledException)
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    throw new TimeoutException();
+                    Debug.Assert(timeout.HasExpired);
+                    ThrowHelper.ThrowNpgsqlExceptionWithInnerTimeoutException("The operation has timed out");
                 }
             }
             catch (SocketException ex)

Original file line number	Diff line number	Diff line change
`@@ -1339,7 +1339,7 @@ async Task ConnectAsync(NpgsqlTimeout timeout, CancellationToken cancellationTok`
`1339`	`1339`	`}`
`1340`	`1340`	`else`
`1341`	`1341`	`{`
`1342`		`- IPAddress[] ipAddresses;`
	`1342`	`+ IPAddress[] ipAddresses = [];`
`1343`	`1343`	`try`
`1344`	`1344`	`{`
`1345`	`1345`	`using var combinedCts = timeout.IsSet ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken) : null;`
`@@ -1352,7 +1352,8 @@ async Task ConnectAsync(NpgsqlTimeout timeout, CancellationToken cancellationTok`
`1352`	`1352`	`catch (OperationCanceledException)`
`1353`	`1353`	`{`
`1354`	`1354`	`cancellationToken.ThrowIfCancellationRequested();`
`1355`		`- throw new TimeoutException();`
	`1355`	`+ Debug.Assert(timeout.HasExpired);`
	`1356`	`+ ThrowHelper.ThrowNpgsqlExceptionWithInnerTimeoutException("The operation has timed out");`
`1356`	`1357`	`}`
`1357`	`1358`	`}`
`1358`	`1359`	`catch (SocketException ex)`