From 65beccf9953faad89cefac4f3823de5dc75d66da Mon Sep 17 00:00:00 2001 From: Gurjeet Singh Date: Thu, 20 Apr 2023 22:49:00 -0700 Subject: [PATCH v0] Reorder connection markers in TAP tests Commit 7f5b198 introduced TAP tests that use string literals to mark the presence of a query in server logs. For no explicable reason, the tests with the marker 'connect2' occur before the tests that use 'connect1' marker. So swap the connection marker strings so that a reader doesn't have to spend extra effort in trying to decipher why 'connect2' tests appear before 'connect1' tests. --- src/interfaces/libpq/t/003_load_balance_host_list.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interfaces/libpq/t/003_load_balance_host_list.pl b/src/interfaces/libpq/t/003_load_balance_host_list.pl index 6963ef3849..7f1bb0c5bc 100644 --- a/src/interfaces/libpq/t/003_load_balance_host_list.pl +++ b/src/interfaces/libpq/t/003_load_balance_host_list.pl @@ -36,8 +36,8 @@ $node1->connect_fails( # load_balance_hosts=disable should always choose the first one. $node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=disable", "load_balance_hosts=disable connects to the first node", - sql => "SELECT 'connect2'", - log_like => [qr/statement: SELECT 'connect2'/]); + sql => "SELECT 'connect1'", + log_like => [qr/statement: SELECT 'connect1'/]); # Statistically the following loop with load_balance_hosts=random will almost # certainly connect at least once to each of the nodes. The chance of that not @@ -45,12 +45,12 @@ $node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=disable", foreach my $i (1 .. 50) { $node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=random", "repeated connections with random load balancing", - sql => "SELECT 'connect1'"); + sql => "SELECT 'connect2'"); } -my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect1'/g; -my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect1'/g; -my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect1'/g; +my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect2'/g; +my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect2'/g; +my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect2'/g; my $total_occurences = $node1_occurences + $node2_occurences + $node3_occurences; -- 2.35.1