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 <zack@redhat.com>

diff --git a/teuthology/provision/cloud/test/test_openstack.py b/teuthology/provision/cloud/test/test_openstack.py
index 08f5b9c08a30ed076b2aefa056832b75ffe7d602..108532ed568641414f92b534dd99eff5ab807b34 100644 (file)
--- 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):