thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65794 from zvonand/zvonand-fix-65762

Browse Source 
Try to make `test_ldap_external_user_directory` less flaky
This commit is contained in:
Alexey Milovidov 2024-06-29 22:32:42 +00:00 committed by GitHub
commit 36644df625
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/compose/docker_compose_ldap.yml
View File

@ -15,7 +15,10 @@ services:
ports: ports:
- ${LDAP_EXTERNAL_PORT:-1389}:${LDAP_INTERNAL_PORT:-1389} - ${LDAP_EXTERNAL_PORT:-1389}:${LDAP_INTERNAL_PORT:-1389}
healthcheck: healthcheck:
test: "ldapsearch -x -b dc=example,dc=org cn > /dev/null" test: >
ldapsearch -x -H ldap://localhost:$$LDAP_PORT_NUMBER -D $$LDAP_ADMIN_DN -w $$LDAP_ADMIN_PASSWORD -b $$LDAP_ROOT
| grep -c -E "member: cn=j(ohn|ane)doe"
| grep 2 >> /dev/null
interval: 10s interval: 10s
retries: 10 retries: 10
timeout: 2s timeout: 2s

4
tests/integration/helpers/cluster.py
View File

@ -2640,7 +2640,9 @@ class ClickHouseCluster:
[ [
"bash", "bash",
"-c", "-c",
f"/opt/bitnami/openldap/bin/ldapsearch -x -H ldap://{self.ldap_host}:{self.ldap_port} -D cn=admin,dc=example,dc=org -w clickhouse -b dc=example,dc=org", f"/opt/bitnami/openldap/bin/ldapsearch -x -H ldap://{self.ldap_host}:{self.ldap_port} -D cn=admin,dc=example,dc=org -w clickhouse -b dc=example,dc=org"
f'| grep -c -E "member: cn=j(ohn|ane)doe"'
f"| grep 2 >> /dev/null",
], ],
user="root", user="root",
) )