summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test/postmaster/t/002_connection_limits.pl5
-rw-r--r--src/test/postmaster/t/003_start_stop.pl7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/postmaster/t/002_connection_limits.pl b/src/test/postmaster/t/002_connection_limits.pl
index 4a7fb16261f..2fc821ad0b4 100644
--- a/src/test/postmaster/t/002_connection_limits.pl
+++ b/src/test/postmaster/t/002_connection_limits.pl
@@ -74,6 +74,11 @@ sub connect_fails_wait
ok(1, "$test_name: client backend process exited");
}
+# Restart the server to ensure that any backends launched for the
+# initialization steps are gone. Otherwise they could still be using
+# up connection slots and mess with our expectations.
+$node->restart;
+
my @sessions = ();
my @raw_connections = ();
diff --git a/src/test/postmaster/t/003_start_stop.pl b/src/test/postmaster/t/003_start_stop.pl
index 58e7ba6cc42..25d6f667217 100644
--- a/src/test/postmaster/t/003_start_stop.pl
+++ b/src/test/postmaster/t/003_start_stop.pl
@@ -46,6 +46,11 @@ if (!$node->raw_connect_works())
plan skip_all => "this test requires working raw_connect()";
}
+# Restart the server to ensure that the backend launched for
+# raw_connect_works() is gone. Otherwise, it might free up the
+# connection slot later, when we expect all the slots to be in use.
+$node->restart;
+
my @raw_connections = ();
# Open a lot of TCP (or Unix domain socket) connections to use up all
@@ -81,7 +86,7 @@ for (my $i = 0; $i <= 20; $i++)
# clients already" instead of "role does not exist" error. Test that
# to ensure that we have used up all the slots.
$node->connect_fails("dbname=postgres user=invalid_user",
- "connect ",
+ "connection is rejected when all slots are in use",
expected_stderr => qr/FATAL: sorry, too many clients already/);
# Open one more connection, to really ensure that we have at least one