Skip to content

Commit

Permalink
Merge cockroachdb#105862
Browse files Browse the repository at this point in the history 
105862: roachtest: Fix npgsql test r=rafiss a=rimadeodhar

This PR fixes the npgsql test by removing the read committed tests which have now started passing on master thanks to the recent work to add support for read committed isolation level. Additionally, added a few more flaky tests to the ignore list.

Epic: none
Fixes: cockroachdb#103619
Release note: None

Co-authored-by: rimadeodhar <[email protected]>
  • Loading branch information
@rimadeodhar
craig[bot] and rimadeodhar committed Jun 30, 2023
2 parents 947a636 + 9fff22d commit 0d77560
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions pkg/cmd/roachtest/tests/npgsql_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,17 +458,13 @@ var npgsqlBlocklist = blocklist{
`Npgsql.Tests.SystemTransactionTests.Timeout_triggers_rollback_while_busy`: "unknown",
`Npgsql.Tests.SystemTransactionTests.Two_consecutive_connections`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Empty_Dispose`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Isolation_levels(ReadCommitted,"read committed")`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Isolation_levels(ReadUncommitted,"read uncommitted")`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Isolation_levels(RepeatableRead,"repeatable read")`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Isolation_levels(Snapshot,"repeatable read")`: "unknown",
`Npgsql.Tests.TransactionTests(Multiplexing).Isolation_levels(Unspecified,"read committed")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Empty_Dispose`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Isolation_levels(ReadCommitted,"read committed")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Isolation_levels(ReadUncommitted,"read uncommitted")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Isolation_levels(RepeatableRead,"repeatable read")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Isolation_levels(Snapshot,"repeatable read")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Isolation_levels(Unspecified,"read committed")`: "unknown",
`Npgsql.Tests.TransactionTests(NonMultiplexing).Transaction_not_supported`: "unknown",
`Npgsql.Tests.TypeMapperTests.Global_mapping`: "51480",
`Npgsql.Tests.TypeMapperTests.Global_mapping_reset`: "51480",
Expand Down Expand Up @@ -634,11 +630,9 @@ var npgsqlBlocklist = blocklist{
`Npgsql.Tests.Types.HstoreTests(NonMultiplexing).Hstore_empty`: "54516",
`Npgsql.Tests.Types.InternalTypeTests(Multiplexing).Internal_uint_types(Regconfig)`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(Multiplexing).Internal_uint_types(Regtype)`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(Multiplexing).NpgsqlLogSequenceNumber`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(Multiplexing).Tid`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(NonMultiplexing).Internal_uint_types(Regconfig)`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(NonMultiplexing).Internal_uint_types(Regtype)`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(NonMultiplexing).NpgsqlLogSequenceNumber`: "unknown",
`Npgsql.Tests.Types.InternalTypeTests(NonMultiplexing).Tid`: "unknown",
`Npgsql.Tests.Types.JsonPathTests(Multiplexing).Read("'$'","$")`: "22513",
`Npgsql.Tests.Types.JsonPathTests(Multiplexing).Read("'$\"varname\"'","$\"varname\"")`: "22513",
Expand Down Expand Up @@ -751,11 +745,13 @@ var npgsqlBlocklist = blocklist{
}

var npgsqlIgnoreList = blocklist{
`Npgsql.Tests.CommandTests(Multiplexing).Statement_mapped_output_parameters(Default)`: "flaky",
`Npgsql.Tests.CommandTests(NonMultiplexing).Statement_mapped_output_parameters(SequentialAccess)`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).PostgreSqlVersion_ServerVersion`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).Connector_not_initialized_exception`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).Many_open_close_with_transaction`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).ManyOpenClose`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).PhysicalConnectionInitializer_async`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).PhysicalConnectionInitializer_sync`: "flaky",
`Npgsql.Tests.ConnectionTests(NonMultiplexing).Timezone_connection_param`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Cancel_binary_import`: "flaky",
Expand All @@ -771,17 +767,25 @@ var npgsqlIgnoreList = blocklist{
`Npgsql.Tests.CopyTests(Multiplexing).Import_string_with_buffer_length`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Prepended_messages`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Text_import(False)`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Text_import(True)`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Text_import_empty`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Write_column_out_of_bounds_throws`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Write_null_values`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Wrong_table_definition_binary_export`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Wrong_table_definition_binary_import`: "flaky",
`Npgsql.Tests.CopyTests(Multiplexing).Wrong_table_definition_raw_binary_copy`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Cancel_text_export_when_not_consumed_and_then_Dispose`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Import_numeric`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Import_string_array`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Import_string_with_buffer_length`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Prepended_messages`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Undefined_table_throws`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Write_column_out_of_bounds_throws`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Write_null_values`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Wrong_format_binary_export`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Wrong_format_binary_import`: "flaky",
`Npgsql.Tests.CopyTests(NonMultiplexing).Wrong_format_raw_binary_copy`: "flaky",
`Npgsql.Tests.NotificationTests.WaitAsync_with_timeout`: "flaky",
`Npgsql.Tests.TransactionTests(Multiplexing).Failed_transaction_on_close_with_custom_timeout`: "flaky",
`Npgsql.Tests.TransactionTests(NonMultiplexing).CommitAsync(Prepared)`: "flaky",
}

0 comments on commit 0d77560

Please sign in to comment.