On Thu, Apr 20, 2023 at 11:00 PM Gurjeet Singh <gurj...@singh.im> wrote:
>
> 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.
>
> The attached patch swaps the connection marker strings so that a
> reader doesn't have to spend extra deciphering why 'connect2' tests
> appear before 'connect1' tests.
Please see attached v2 of the patch. It now includes same fix in
another TAP tests file.
Best regards,
Gurjeet https://Gurje.et
Postgres Contributors Team, http://aws.amazon.com
From 8e785d5b440f17f7788c722582b2613e092ca18c Mon Sep 17 00:00:00 2001
From: Gurjeet Singh <gurjeet@singh.im>
Date: Thu, 20 Apr 2023 22:49:00 -0700
Subject: [PATCH v2] 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 deciphering why 'connect2' tests appear before
'connect1' tests.
---
.../libpq/t/003_load_balance_host_list.pl | 12 ++++++------
src/interfaces/libpq/t/004_load_balance_dns.pl | 14 +++++++-------
2 files changed, 13 insertions(+), 13 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;
diff --git a/src/interfaces/libpq/t/004_load_balance_dns.pl b/src/interfaces/libpq/t/004_load_balance_dns.pl
index d9b382dba9..b07bc9c074 100644
--- a/src/interfaces/libpq/t/004_load_balance_dns.pl
+++ b/src/interfaces/libpq/t/004_load_balance_dns.pl
@@ -9,7 +9,7 @@ use Test::More;
if ($ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)
{
plan skip_all =>
- 'Potentially unsafe test load_balance not enabled in PG_TEST_EXTRA';
+ 'Potentially unsafe test; load_balance not enabled in PG_TEST_EXTRA';
}
# This tests loadbalancing based on a DNS entry that contains multiple records
@@ -78,8 +78,8 @@ $node3->start();
# load_balance_hosts=disable should always choose the first one.
$node1->connect_ok("host=pg-loadbalancetest port=$port 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
@@ -88,12 +88,12 @@ $node1->connect_ok("host=pg-loadbalancetest port=$port load_balance_hosts=disabl
foreach my $i (1 .. 50) {
$node1->connect_ok("host=pg-loadbalancetest port=$port 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
