Skip to content

Commit 6cf0dcb

Browse files
committed
Fix LDAP integration test port conflict in parallel CI runs
1 parent e4add94 commit 6cf0dcb

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

tests/integration/helpers/cluster.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ def __init__(
749749
self.ldap_host = "openldap"
750750
self.ldap_container = None
751751
self.ldap_port = 1389
752+
self._ldap_external_port = 0
752753
self.ldap_id = self.get_instance_docker_id(self.ldap_host)
753754

754755
# available when with_rabbitmq == True
@@ -1011,6 +1012,13 @@ def redis_port(self):
10111012
self._redis_port = self.port_pool.get_port()
10121013
return self._redis_port
10131014

1015+
@property
1016+
def ldap_external_port(self):
1017+
if self._ldap_external_port:
1018+
return self._ldap_external_port
1019+
self._ldap_external_port = self.port_pool.get_port()
1020+
return self._ldap_external_port
1021+
10141022
@property
10151023
def nats_port(self):
10161024
if self._nats_port:
@@ -1781,7 +1789,7 @@ def setup_cassandra_cmd(self, instance, env_variables, docker_compose_yml_dir):
17811789

17821790
def setup_ldap_cmd(self, instance, env_variables, docker_compose_yml_dir):
17831791
self.with_ldap = True
1784-
env_variables["LDAP_EXTERNAL_PORT"] = str(self.ldap_port)
1792+
env_variables["LDAP_EXTERNAL_PORT"] = str(self.ldap_external_port)
17851793
self.base_cmd.extend(
17861794
["--file", p.join(docker_compose_yml_dir, "docker_compose_ldap.yml")]
17871795
)

0 commit comments

Comments
 (0)