zuul/zuul
Code Issues Proposed changes

Fix zk host env var for tests

Browse Source 
NODEPOOL_ZK_HOST was used instead of ZUUL_ZK_HOST

Change-Id: Ib5c694c74a400671093ef3ccf0b7a47b3bb1eab2
This commit is contained in:
Benjamin Schanzel 2023-04-05 14:01:08 +02:00
parent b2dc863b44
commit 20eb8d15d1
No known key found for this signature in database
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/base.py
View File

@ -3980,15 +3980,15 @@ class ChrootedKazooFixture(fixtures.Fixture):
if 'ZOOKEEPER_2181_TCP' in os.environ:
# prevent any nasty hobbits^H^H^H suprises
if 'NODEPOOL_ZK_HOST' in os.environ:
if 'ZUUL_ZK_HOST' in os.environ:
raise Exception(
'Looks like tox-docker is being used but you have also '
'configured NODEPOOL_ZK_HOST. Either avoid using the '
'docker environment or unset NODEPOOL_ZK_HOST.')
'configured ZUUL_ZK_HOST. Either avoid using the '
'docker environment or unset ZUUL_ZK_HOST.')
zk_host = 'localhost:' + os.environ['ZOOKEEPER_2181_TCP']
elif 'NODEPOOL_ZK_HOST' in os.environ:
zk_host = os.environ['NODEPOOL_ZK_HOST']
zk_host = 'localhost:' + os.environ['ZUUL_2181_TCP']
elif 'ZUUL_ZK_HOST' in os.environ:
zk_host = os.environ['ZUUL_ZK_HOST']
else:
zk_host = 'localhost'

2
tox.ini
View File

@ -16,7 +16,6 @@ setenv =
SQLALCHEMY_WARN_20={env:SQLALCHEMY_WARN_20:1}
PYTHONWARNINGS=always::DeprecationWarning:zuul.driver.sql.sqlconnection,always::DeprecationWarning:tests.base,always::DeprecationWarning:tests.unit.test_database,always::DeprecationWarning:zuul.driver.sql.alembic.env,always::DeprecationWarning:zuul.driver.sql.alembic.script
passenv =
NODEPOOL_ZK_HOST
OS_LOG_CAPTURE
OS_LOG_DEFAULTS
OS_STDERR_CAPTURE
@ -90,7 +89,6 @@ deps =
[testenv:remote]
passenv =
NODEPOOL_ZK_HOST
OS_LOG_CAPTURE
OS_LOG_DEFAULTS
OS_STDERR_CAPTURE