diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-04-21 12:29:38 +0200 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-04-21 12:29:38 +0200 |
| commit | a23ab2eebfb19bacb9e8d91edb822a0fec37334c (patch) | |
| tree | 08882f89b66d02cf2114d0f01f910b3860eda038 | |
| parent | 60ce452729239f10ebbd0803a0ecc460f7f9238a (diff) | |
| download | postgresql-a23ab2eebfb19bacb9e8d91edb822a0fec37334c.tar.gz | |
Reorder connection markers in loadbalance tests
Commit 7f5b198 introduced TAP tests that use string literals to mark
the presence of a query in server logs. Reorder the markers to make
sure they are used in alphabetical order for easier debugging.
Author: Gurjeet Singh <gurjeet@singh.im>
Reviewed-by: Jelte Fennema <postgres@jeltef.nl>
Discussion: https://postgr.es/m/CABwTF4WcYAENqyUQS2crAYfDuJ497v82ty2-MirjaC+zz9e8nQ@mail.gmail.com
| -rw-r--r-- | src/interfaces/libpq/t/003_load_balance_host_list.pl | 12 | ||||
| -rw-r--r-- | src/interfaces/libpq/t/004_load_balance_dns.pl | 12 |
2 files changed, 12 insertions, 12 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..c66ee2461a 100644 --- a/src/interfaces/libpq/t/004_load_balance_dns.pl +++ b/src/interfaces/libpq/t/004_load_balance_dns.pl @@ -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; |