diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2019-07-26 10:01:18 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2019-07-26 10:09:54 +1200 |
| commit | 77d5dea386f5747ca56bac1ae745e4604111adda (patch) | |
| tree | 443cfa6be55ac4db8caa642985fad26f82812db2 | |
| parent | e465d9d4058884e848571f3a59c541feb030a7b2 (diff) | |
| download | postgresql-77d5dea386f5747ca56bac1ae745e4604111adda.tar.gz postgresql-77d5dea386f5747ca56bac1ae745e4604111adda.zip | |
Fix LDAP test instability.
After starting slapd, wait until it can accept a connection before
beginning the real test work. This avoids occasional test failures.
Back-patch to 11, where the LDAP tests arrived.
Author: Thomas Munro
Reviewed-by: Michael Paquier
Discussion: https://postgr.es/m/20190719033013.GI1859%40paquier.xyz
| -rw-r--r-- | src/test/ldap/t/001_auth.pl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl index 431ad6442c3..f601c2b04a7 100644 --- a/src/test/ldap/t/001_auth.pl +++ b/src/test/ldap/t/001_auth.pl @@ -113,6 +113,22 @@ END append_to_file($ldap_pwfile, $ldap_rootpw); chmod 0600, $ldap_pwfile or die; +# wait until slapd accepts requests +my $retries = 0; +while (1) +{ + last + if ( + system_log( + "ldapsearch", "-h", $ldap_server, "-p", + $ldap_port, "-s", "base", "-b", + $ldap_basedn, "-D", $ldap_rootdn, "-y", + $ldap_pwfile, "-n", "'objectclass=*'") == 0); + die "cannot connect to slapd" if ++$retries >= 300; + note "waiting for slapd to accept requests..."; + Time::HiRes::usleep(1000000); +} + $ENV{'LDAPURI'} = $ldap_url; $ENV{'LDAPBINDDN'} = $ldap_rootdn; $ENV{'LDAPCONF'} = $ldap_conf; |