Merge 78ca758 into blathers/backport-release-25.4-167474

bghal · web-flow · commit 778c937dc0b5 · 2026-04-03T11:27:46.000-04:00
diff --git a/pkg/cmd/roachtest/tests/npgsql_blocklist.go b/pkg/cmd/roachtest/tests/npgsql_blocklist.go
@@ -661,6 +661,7 @@ var npgsqlBlocklist = blocklist{
 }
 
 var npgsqlIgnoreList = blocklist{
+	`Npgsql.Tests.CommandTests(NonMultiplexing).Cancel_async_soft`:                                   "flaky",
 	`Npgsql.Tests.ConnectionTests(Multiplexing).Fail_connect_then_succeed(True)`:                     "flaky",
 	`Npgsql.Tests.CopyTests(Multiplexing).Import_numeric`:                                            "flaky",
 	`Npgsql.Tests.CopyTests(Multiplexing).Import_string_array`:                                       "flaky",

Original file line number	Diff line number	Diff line change
`@@ -661,6 +661,7 @@ var npgsqlBlocklist = blocklist{`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`var npgsqlIgnoreList = blocklist{`
	`664`	+ `Npgsql.Tests.CommandTests(NonMultiplexing).Cancel_async_soft`: "flaky",
`664`	`665`	`Npgsql.Tests.ConnectionTests(Multiplexing).Fail_connect_then_succeed(True)`: "flaky",
`665`	`666`	`Npgsql.Tests.CopyTests(Multiplexing).Import_numeric`: "flaky",
`666`	`667`	`Npgsql.Tests.CopyTests(Multiplexing).Import_string_array`: "flaky",