From 20eb8d15d10d84037028c044d57dafcdb1d39e19 Mon Sep 17 00:00:00 2001 From: Benjamin Schanzel Date: Wed, 5 Apr 2023 14:01:08 +0200 Subject: [PATCH] Fix zk host env var for tests NODEPOOL_ZK_HOST was used instead of ZUUL_ZK_HOST Change-Id: Ib5c694c74a400671093ef3ccf0b7a47b3bb1eab2 --- tests/base.py | 12 ++++++------ tox.ini | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/base.py b/tests/base.py index 1cfcecde57..ab345c842b 100644 --- a/tests/base.py +++ b/tests/base.py @@ -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' diff --git a/tox.ini b/tox.ini index 9c7fc5d280..d53d81b0bd 100644 --- a/tox.ini +++ b/tox.ini @@ -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