From 12bd20f5d0deb1b31520a641df884034f8adf044 Mon Sep 17 00:00:00 2001 From: Hou Zhijie Date: Fri, 21 Mar 2025 14:09:01 +0800 Subject: [PATCH v2 2/3] merge tests --- src/test/subscription/t/035_conflicts.pl | 52 ++++++++---------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/src/test/subscription/t/035_conflicts.pl b/src/test/subscription/t/035_conflicts.pl index 37f8af07995..d06e64747cb 100644 --- a/src/test/subscription/t/035_conflicts.pl +++ b/src/test/subscription/t/035_conflicts.pl @@ -67,26 +67,16 @@ $node_publisher->safe_psql('postgres', # Confirm that this causes an error on the subscriber $node_subscriber->wait_for_log( - qr/ERROR: conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts/, + qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.* +.*Key already exists in unique index \"conf_tab_pkey\".* +.*Key \(a\)=\(2\); existing local tuple \(2, 2, 2\); remote tuple \(2, 3, 4\).* +.*Key already exists in unique index \"conf_tab_b_key\".* +.*Key \(b\)=\(3\); existing local tuple \(3, 3, 3\); remote tuple \(2, 3, 4\).* +.*Key already exists in unique index \"conf_tab_c_key\".* +.*Key \(c\)=\(4\); existing local tuple \(4, 4, 4\); remote tuple \(2, 3, 4\)./, $log_offset); -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_pkey\".*\n.*Key \(a\)=\(2\); existing local tuple \(2, 2, 2\); remote tuple \(2, 3, 4\)./, - $log_offset), - 'multiple_unique_conflicts detected during insertion for conf_tab_pkey (a) = (2)' -); - -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_b_key\".*\n.*Key \(b\)=\(3\); existing local tuple \(3, 3, 3\); remote tuple \(2, 3, 4\)./, - $log_offset), - 'multiple_unique_conflicts detected during insertion for conf_tab_b_key (b) = (3)' -); - -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_c_key\".*\n.*Key \(c\)=\(4\); existing local tuple \(4, 4, 4\); remote tuple \(2, 3, 4\)./, - $log_offset), - 'multiple_unique_conflicts detected during insertion for conf_tab_c_key (c) = (4)' -); +pass('multiple_unique_conflicts detected during update'); # Truncate table to get rid of the error $node_subscriber->safe_psql('postgres', "TRUNCATE conf_tab;"); @@ -109,25 +99,15 @@ $node_publisher->safe_psql('postgres', # Confirm that this causes an error on the subscriber $node_subscriber->wait_for_log( - qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts/, + qr/conflict detected on relation \"public.conf_tab\": conflict=multiple_unique_conflicts.* +.*Key already exists in unique index \"conf_tab_pkey\".* +.*Key \(a\)=\(6\); existing local tuple \(6, 6, 6\); remote tuple \(6, 7, 8\).* +.*Key already exists in unique index \"conf_tab_b_key\".* +.*Key \(b\)=\(7\); existing local tuple \(7, 7, 7\); remote tuple \(6, 7, 8\).* +.*Key already exists in unique index \"conf_tab_c_key\".* +.*Key \(c\)=\(8\); existing local tuple \(8, 8, 8\); remote tuple \(6, 7, 8\)./, $log_offset); -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_pkey\".*\n.*Key \(a\)=\(6\); existing local tuple \(6, 6, 6\); remote tuple \(6, 7, 8\)./, - $log_offset), - 'multiple_unique_conflicts detected during update for conf_tab_pkey (a) = (6)' -); - -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_b_key\".*\n.*Key \(b\)=\(7\); existing local tuple \(7, 7, 7\); remote tuple \(6, 7, 8\)./, - $log_offset), - 'multiple_unique_conflicts detected during update for conf_tab_b_key (b) = (7)' -); - -ok( $node_subscriber->log_contains( - qr/Key already exists in unique index \"conf_tab_c_key\".*\n.*Key \(c\)=\(8\); existing local tuple \(8, 8, 8\); remote tuple \(6, 7, 8\)./, - $log_offset), - 'multiple_unique_conflicts detected during update for conf_tab_c_key (c) = (8)' -); +pass('multiple_unique_conflicts detected during insert'); done_testing(); -- 2.30.0.windows.2