From 65556cadcad35545d61f004b9c81c213707e6853 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 24 Sep 2018 10:29:12 -0400 Subject: [PATCH] ceph-volume tests reset the cluster name after every unit test Signed-off-by: Alfredo Deza (cherry picked from commit 877ee1a27e0651355812e27fbc6ac0a87ea56a68) --- src/ceph-volume/ceph_volume/tests/conftest.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/ceph-volume/ceph_volume/tests/conftest.py b/src/ceph-volume/ceph_volume/tests/conftest.py index 5222b45e76d67..dfa84e5677033 100644 --- a/src/ceph-volume/ceph_volume/tests/conftest.py +++ b/src/ceph-volume/ceph_volume/tests/conftest.py @@ -85,6 +85,22 @@ def stub_call(monkeypatch): return apply +@pytest.fixture(autouse=True) +def reset_cluster_name(request, monkeypatch): + """ + The globally available ``ceph_volume.conf.cluster`` might get mangled in + tests, make sure that after evert test, it gets reset, preventing pollution + going into other tests later. + """ + def fin(): + conf.cluster = None + try: + os.environ.pop('CEPH_CONF') + except KeyError: + pass + request.addfinalizer(fin) + + @pytest.fixture def conf_ceph(monkeypatch): """ -- 2.39.5