From d954449ae1d206b1901f70f8f000dc003d9a88d9 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 18 Mar 2022 12:55:46 -0600 Subject: [PATCH] TestOpenStackBase.setup: Remove arguments In newer py.test versions, the test method itself was being passed as the conf arg, causing errors. We don't even use it, so remove it. Signed-off-by: Zack Cerza --- teuthology/provision/cloud/test/test_openstack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/provision/cloud/test/test_openstack.py b/teuthology/provision/cloud/test/test_openstack.py index 08f5b9c08a..108532ed56 100644 --- a/teuthology/provision/cloud/test/test_openstack.py +++ b/teuthology/provision/cloud/test/test_openstack.py @@ -76,8 +76,8 @@ def get_fake_obj(mock_args=None, attributes=None): class TestOpenStackBase(object): - def setup(self, conf=dict(), test_config=test_config): - config.load(conf or dict(libcloud=deepcopy(test_config))) + def setup(self): + config.load(dict(libcloud=deepcopy(test_config))) self.start_patchers() def start_patchers(self): -- 2.39.5