database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Make subscription tests pass with log_error_verbosity=verbose

Browse Source 
Recent additions to the subscription tests check for log entries, but
fail to account for the possible presence of an SQL errror code, which
happens if log_error_verbosity is set to 'verbose'. Add this into the
regular expressions that are checked for.
This commit is contained in:
Andrew Dunstan
2022-06-12 09:17:17 -04:00
parent 0d932a9d99
commit 19408aae7f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/subscription/t/027_nosuperuser.pl
View File

@ -179,7 +179,7 @@ revoke_superuser("regress_admin");
publish_update("alice.unpartitioned", 5 => 9); publish_update("alice.unpartitioned", 5 => 9);
expect_failure( expect_failure(
"alice.unpartitioned", 2, 5, 7, "alice.unpartitioned", 2, 5, 7,
qr/ERROR: permission denied for table unpartitioned/msi, qr/ERROR: ( [A-Z0-9]+:)? permission denied for table unpartitioned/msi,
"non-superuser admin fails to replicate update"); "non-superuser admin fails to replicate update");
grant_superuser("regress_admin"); grant_superuser("regress_admin");
expect_replication("alice.unpartitioned", 2, 7, 9, expect_replication("alice.unpartitioned", 2, 7, 9,
@ -214,7 +214,7 @@ expect_failure(
3, 3,
7, 7,
11, 11,
qr/ERROR: permission denied for table unpartitioned/msi, qr/ERROR: ( [A-Z0-9]+:)? permission denied for table unpartitioned/msi,
"non-superuser admin without SELECT privileges fails to replicate update" "non-superuser admin without SELECT privileges fails to replicate update"
); );
@ -262,7 +262,7 @@ expect_failure(
2, 2,
11, 11,
13, 13,
qr/ERROR: "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi, qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
"non-superuser admin fails to replicate insert into rls enabled table"); "non-superuser admin fails to replicate insert into rls enabled table");
grant_superuser("regress_admin"); grant_superuser("regress_admin");
expect_replication("alice.unpartitioned", 3, 11, 15, expect_replication("alice.unpartitioned", 3, 11, 15,
@ -276,7 +276,7 @@ expect_failure(
3, 3,
11, 11,
15, 15,
qr/ERROR: "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi, qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
"non-superuser admin fails to replicate update into rls enabled unpartitioned" "non-superuser admin fails to replicate update into rls enabled unpartitioned"
); );
@ -291,7 +291,7 @@ expect_failure(
3, 3,
13, 13,
17, 17,
qr/ERROR: "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi, qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
"non-superuser admin without bypassrls fails to replicate delete into rls enabled unpartitioned" "non-superuser admin without bypassrls fails to replicate delete into rls enabled unpartitioned"
); );
grant_bypassrls("regress_admin"); grant_bypassrls("regress_admin");

2
src/test/subscription/t/029_on_error.pl
View File

@ -48,7 +48,7 @@ sub test_skip_lsn
# Check the log to ensure that the transaction is skipped, and advance the # Check the log to ensure that the transaction is skipped, and advance the
# offset of the log file for the next test. # offset of the log file for the next test.
$offset = $node_subscriber->wait_for_log( $offset = $node_subscriber->wait_for_log(
qr/LOG: done skipping logical replication transaction finished at $lsn/, qr/LOG: ( [A-Z0-9]+:)? done skipping logical replication transaction finished at $lsn/,
$offset); $offset);
# Insert non-conflict data # Insert non-conflict data