]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
tests: Rename setup() and teardown() methods
authorZack Cerza <zack@redhat.com>
Fri, 20 Jan 2023 18:59:59 +0000 (11:59 -0700)
committerZack Cerza <zack@redhat.com>
Fri, 20 Jan 2023 23:13:48 +0000 (16:13 -0700)
These were nose methods, and pytest is dropping support for them.

Signed-off-by: Zack Cerza <zack@redhat.com>
45 files changed:
teuthology/dispatcher/test/test_reimage_error_mark_machine_down.py
teuthology/openstack/test/openstack-integration.py
teuthology/openstack/test/test_config.py
teuthology/openstack/test/test_openstack.py
teuthology/orchestra/test/integration/test_integration.py
teuthology/orchestra/test/test_cluster.py
teuthology/orchestra/test/test_connection.py
teuthology/orchestra/test/test_console.py
teuthology/orchestra/test/test_remote.py
teuthology/orchestra/test/test_run.py
teuthology/provision/cloud/test/test_base.py
teuthology/provision/cloud/test/test_cloud_init.py
teuthology/provision/cloud/test/test_cloud_util.py
teuthology/provision/cloud/test/test_openstack.py
teuthology/provision/test/test_downburst.py
teuthology/provision/test/test_fog.py
teuthology/provision/test/test_init_provision.py
teuthology/provision/test/test_pelagos.py
teuthology/suite/test/test_build_matrix.py
teuthology/suite/test/test_merge.py
teuthology/suite/test/test_run_.py
teuthology/suite/test/test_util.py
teuthology/task/tests/test_fetch_coredumps.py
teuthology/test/integration/test_suite.py
teuthology/test/task/__init__.py
teuthology/test/task/test_ansible.py
teuthology/test/task/test_ceph_ansible.py
teuthology/test/task/test_console_log.py
teuthology/test/task/test_internal.py
teuthology/test/task/test_kernel.py
teuthology/test/task/test_pcp.py
teuthology/test/task/test_selinux.py
teuthology/test/test_config.py
teuthology/test/test_contextutil.py
teuthology/test/test_describe_tests.py
teuthology/test/test_email_sleep_before_teardown.py
teuthology/test/test_exit.py
teuthology/test/test_get_distro.py
teuthology/test/test_get_distro_version.py
teuthology/test/test_misc.py
teuthology/test/test_packaging.py
teuthology/test/test_report.py
teuthology/test/test_results.py
teuthology/test/test_vps_os_vers_parameter_checking.py
teuthology/test/test_worker.py

index f2365174e7cf16bc730cc8d532d9384b2f98f3d8..63ec8ebbe6b27b190c29e91d3bc4af706f4bb32b 100644 (file)
@@ -2,7 +2,7 @@ from teuthology.dispatcher import supervisor
 from unittest.mock import patch
 
 class TestCheckReImageFailureMarkDown(object):
-    def setup(self):
+    def setup_method(self):
         self.the_function = supervisor.check_for_reimage_failures_and_mark_down
 
     def create_n_out_of_10_reimage_failed_jobs(self, n):
index 41dde59b223394624edc1926fc77225886d6ccbe..c4eb7aaf667281164975d3484431f03abf4c90e7 100644 (file)
@@ -105,7 +105,7 @@ class Integration(object):
 
 class TestSuite(Integration):
 
-    def setup(self):
+    def setup_method(self):
         self.d = tempfile.mkdtemp()
         self.setup_worker()
         logging.info("TestSuite: done worker")
@@ -152,7 +152,7 @@ class TestSuite(Integration):
 
 class TestSchedule(Integration):
 
-    def setup(self):
+    def setup_method(self):
         self.d = tempfile.mkdtemp()
         self.setup_worker()
 
@@ -218,7 +218,7 @@ class TestSchedule(Integration):
 
 class TestLock(Integration):
 
-    def setup(self):
+    def setup_method(self):
         self.options = ['--verbose',
                         '--machine-type', 'openstack' ]
 
@@ -259,7 +259,7 @@ class TestLock(Integration):
 
 class TestNuke(Integration):
 
-    def setup(self):
+    def setup_method(self):
         self.options = ['--verbose',
                         '--machine-type', 'openstack']
 
index 5fddeedf0602b7652b449a505967f1e75db4c89a..530aea92713532c51ebde3df1e793334c21cfacc 100644 (file)
@@ -3,7 +3,7 @@ from teuthology.config import config
 
 class TestOpenStack(object):
 
-    def setup(self):
+    def setup_method(self):
         self.openstack_config = config['openstack']
 
     def test_config_clone(self):
index 7e5f4359cbef1f24d61d4b0df126ff8bd903b895..1f34d82a0d5f482758b705555d7fac49767491a0 100644 (file)
@@ -40,7 +40,7 @@ import scripts.openstack
 
 class TestOpenStackBase(object):
 
-    def setup(self):
+    def setup_method(self):
         OpenStack.token = None
         OpenStack.token_expires = None
         self.environ = {}
@@ -48,7 +48,7 @@ class TestOpenStackBase(object):
             if k.startswith('OS_'):
                 self.environ[k] = os.environ[k]
 
-    def teardown(self):
+    def teardown_method(self):
         OpenStack.token = None
         OpenStack.token_expires = None
         for k in os.environ.keys():
@@ -1598,8 +1598,8 @@ class TestTeuthologyOpenStack(TestOpenStackBase):
         else:
             self.can_create_floating_ips = False
 
-    def setup(self):
-        super(TestTeuthologyOpenStack, self).setup()
+    def setup_method(self):
+        super(TestTeuthologyOpenStack, self).setup_method()
         self.key_filename = tempfile.mktemp()
         self.key_name = 'teuthology-test'
         self.name = 'teuthology-test'
@@ -1614,8 +1614,8 @@ chmod 600 {key_filename}
                         '--name', self.name,
                         '--verbose']
 
-    def teardown(self):
-        super(TestTeuthologyOpenStack, self).teardown()
+    def teardown_method(self):
+        super(TestTeuthologyOpenStack, self).teardown_method()
         self.clobber()
         os.unlink(self.key_filename)
 
index f4ea627a284c37a24d4cee8a8047bb3780d75ec5..5adeb6dcc361f7d3ab1fc702d674bb3e99d89432 100644 (file)
@@ -14,7 +14,7 @@ HOST = None
 
 
 class TestIntegration():
-    def setup(self):
+    def setup_method(self):
         try:
             host = os.environ['ORCHESTRA_TEST_HOST']
         except KeyError:
index ee0d07a9ebbfd142f2ac42111c7acc9e9e55f919..da9c86156f3658caeb9452a4ff49e36608bfb6bf 100644 (file)
@@ -203,7 +203,7 @@ class TestCluster(object):
 
 class TestWriteFile(object):
     """ Tests for cluster.write_file """
-    def setup(self):
+    def setup_method(self):
         self.r1 = remote.Remote('r1', ssh=Mock())
         self.c = cluster.Cluster(
             remotes=[
index 487632deb6fb733b30616e7bcb653e253d33426d..c93a733257a0fc0cec4256e3757382189609cf5f 100644 (file)
@@ -6,10 +6,10 @@ from teuthology.orchestra.test.util import assert_raises
 
 
 class TestConnection(object):
-    def setup(self):
+    def setup_method(self):
         self.start_patchers()
 
-    def teardown(self):
+    def teardown_method(self):
         self.stop_patchers()
 
     def start_patchers(self):
index 0338a577bae9a5dc2b9cbb781eb4ff08f7779727..fe0399b489edb9da32d6b0c994c3213d51db6604 100644 (file)
@@ -14,7 +14,7 @@ class TestPhysicalConsole(TestConsole):
     ipmi_cmd_templ = 'ipmitool -H {h}.{d} -I lanplus -U {u} -P {p} {c}'
     conserver_cmd_templ = 'console -M {m} -p {p} {mode} {h}'
 
-    def setup(self):
+    def setup_method(self):
         self.hostname = 'host'
         teuth_config.ipmi_domain = 'ipmi_domain'
         teuth_config.ipmi_user = 'ipmi_user'
index 5fa5797eca0592af69aead987d176060b109ae49..2f2aec4bf82d426e02a9ad3d412a4e8b36386adc 100644 (file)
@@ -9,10 +9,10 @@ from teuthology.orchestra.run import RemoteProcess
 
 class TestRemote(object):
 
-    def setup(self):
+    def setup_method(self):
         self.start_patchers()
 
-    def teardown(self):
+    def teardown_method(self):
         self.stop_patchers()
 
     def start_patchers(self):
index 074d90b05da7ed4ff2b152b2f22b09906e5f49a9..e8051ccbc7e807387df6751baddebc83c7f28b37 100644 (file)
@@ -28,10 +28,10 @@ def set_buffer_contents(buf, contents):
 
 
 class TestRun(object):
-    def setup(self):
+    def setup_method(self):
         self.start_patchers()
 
-    def teardown(self):
+    def teardown_method(self):
         self.stop_patchers()
 
     def start_patchers(self):
index b1ef29904b0ca00460f6e5d42f5a44911e9879f5..67e838070c7f1dfe21d43810cacdb43e6727655c 100644 (file)
@@ -8,12 +8,12 @@ from test_cloud_init import dummy_config, dummy_drivers
 
 
 class TestBase(object):
-    def setup(self):
+    def setup_method(self):
         config.load()
         config.libcloud = dummy_config
         cloud.supported_drivers['dummy'] = dummy_drivers
 
-    def teardown(self):
+    def teardown_method(self):
         del cloud.supported_drivers['dummy']
 
 
index fdee723e6c9011449ebadf9cf068174ed0af8c84..1b0df968dcb613300bf85efec0f12abb7c3524fe 100644 (file)
@@ -26,12 +26,12 @@ dummy_drivers = dict(
 
 
 class TestInit(object):
-    def setup(self):
+    def setup_method(self):
         config.load()
         config.libcloud = dummy_config
         cloud.supported_drivers['dummy'] = dummy_drivers
 
-    def teardown(self):
+    def teardown_method(self):
         del cloud.supported_drivers['dummy']
 
     def test_get_types(self):
index 2f6035a7ce67b8a343249a9f638453e9ea2e9a12..3093d2c40bfc90339bb7849f2be4dee0cb38cd25 100644 (file)
@@ -82,7 +82,7 @@ def get_datetime_string(offset_hours=0):
 class TestAuthToken(object):
     klass = util.AuthToken
 
-    def setup(self):
+    def setup_method(self):
         default_expires = get_datetime_string(0)
         self.test_data = dict(
             value='token_value',
@@ -103,7 +103,7 @@ class TestAuthToken(object):
         for name, patcher in self.patchers.items():
             self.mocks[name] = patcher.start()
 
-    def teardown(self):
+    def teardown_method(self):
         for patcher in self.patchers.values():
             patcher.stop()
 
index 108532ed568641414f92b534dd99eff5ab807b34..f65bd41ac61bdf4d26b7b28978d7efe4552ed96d 100644 (file)
@@ -76,7 +76,7 @@ def get_fake_obj(mock_args=None, attributes=None):
 
 
 class TestOpenStackBase(object):
-    def setup(self):
+    def setup_method(self):
         config.load(dict(libcloud=deepcopy(test_config)))
         self.start_patchers()
 
@@ -159,7 +159,7 @@ class TestOpenStackBase(object):
             self.mocks[name] = patcher.start()
         self.mocks['m_get_endpoint'].return_value = 'endpoint'
 
-    def teardown(self):
+    def teardown_method(self):
         for patcher in self.patchers.values():
             patcher.stop()
 
index cc947b28503871ec6cf2488b049c949ddf065785..71ecfaff41b7c716ee5a4696c62921e09295cbca 100644 (file)
@@ -4,7 +4,7 @@ from teuthology import provision
 
 
 class TestDownburst(object):
-    def setup(self):
+    def setup_method(self):
         self.ctx = Mock()
         self.ctx.os_type = 'rhel'
         self.ctx.os_version = '7.0'
index 0f56926da813a7ab71645f1747eaea291c211632..fd2bbb5dfc8c6a902e0f120fefc14e5bc5e290a1 100644 (file)
@@ -19,7 +19,7 @@ test_config = dict(fog=dict(
 class TestFOG(object):
     klass = fog.FOG
 
-    def setup(self):
+    def setup_method(self):
         config.load()
         config.update(deepcopy(test_config))
         self.start_patchers()
@@ -54,7 +54,7 @@ class TestFOG(object):
         for name, patcher in self.patchers.items():
             self.mocks[name] = patcher.start()
 
-    def teardown(self):
+    def teardown_method(self):
         for patcher in self.patchers.values():
             patcher.stop()
 
index 11c67679b41cb968494262d7ac152485a8a97f82..e63c5aa369637874ca3022b713f5ec7f2e9edb24 100644 (file)
@@ -19,7 +19,7 @@ test_config = dict(
 
 class TestInitProvision(object):
 
-    def setup(self):
+    def setup_method(self):
         config.load(deepcopy(test_config))
 
     def test_get_reimage_types(self):
index 3a8a0c4f9681b278dc174855075c8a39016d55cb..43d474176ca9735e4a1c12d598e5b0c8bb215949 100644 (file)
@@ -15,10 +15,10 @@ test_config = dict(
 
 class TestPelagos(object):
 
-    def setup(self):
+    def setup_method(self):
         config.load(deepcopy(test_config))
 
-    def teardown(self):
+    def teardown_method(self):
         pass
 
     def test_get_types(self):
index d7d2c051be36149ec9e5a4f6e9ce2d40077d6aba..ad710d2efc4fb1bfa723af6bff0ccd6cd073dc57 100644 (file)
@@ -27,7 +27,7 @@ class TestBuildMatrix(object):
         'builtins.open',
     ]
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = dict()
         self.patchers = dict()
         for ppoint in self.__class__.patchpoints:
@@ -45,7 +45,7 @@ class TestBuildMatrix(object):
         for patcher in self.patchers.values():
             patcher.stop()
 
-    def teardown(self):
+    def teardown_method(self):
         self.patchers.clear()
         self.mocks.clear()
 
@@ -673,7 +673,7 @@ class TestSubset(object):
         'builtins.open',
     ]
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = dict()
         self.patchers = dict()
         for ppoint in self.__class__.patchpoints:
@@ -691,7 +691,7 @@ class TestSubset(object):
         for patcher in self.patchers.values():
             patcher.stop()
 
-    def teardown(self):
+    def teardown_method(self):
         self.patchers.clear()
         self.mocks.clear()
 
index 2a4c3bfa2583c06acf562ac03c718d2fccaf5813..3b6789b9317121816c5cbac3b4a86d0b49b6df76 100644 (file)
@@ -19,7 +19,7 @@ class TestMerge(TestCase):
         'builtins.open',
     ]
 
-    def setUp(self):
+    def setup_method(self):
         log.debug("setUp")
         self.mocks = dict()
         self.patchers = dict()
@@ -38,8 +38,7 @@ class TestMerge(TestCase):
         for patcher in self.patchers.values():
             patcher.stop()
 
-    def tearDown(self):
-        log.debug("tearDown")
+    def teardown_method(self):
         self.patchers.clear()
         self.mocks.clear()
 
index 278e1358b1e4d572c54b90162eb76d524d2b9b3a..a580c3603c333c71382157edede6ec45aae3aff6 100644 (file)
@@ -23,7 +23,7 @@ from teuthology import packaging
 class TestRun(object):
     klass = run.Run
 
-    def setup(self):
+    def setup_method(self):
         self.args_dict = dict(
             suite='suite',
             suite_branch='suite_branch',
@@ -203,7 +203,7 @@ class TestRun(object):
 class TestScheduleSuite(object):
     klass = run.Run
 
-    def setup(self):
+    def setup_method(self):
         self.args_dict = dict(
             suite='suite',
             suite_relpath='',
index fdd352c4501c381bcfb107c003cda6bb6fc97032..2c4e8f4bd5676c9982a7fcabd81995d8d92a9cfa 100644 (file)
@@ -48,7 +48,7 @@ def git_repository(request):
 
 
 class TestUtil(object):
-    def setup(self):
+    def setup_method(self):
         config.use_shaman = False
 
     @patch('teuthology.suite.util.smtplib.SMTP')
@@ -240,7 +240,7 @@ class TestMissingPackages(object):
     Tests the functionality that checks to see if a
     scheduled job will have missing packages in gitbuilder.
     """
-    def setup(self):
+    def setup_method(self):
         package_versions = {
             'sha1': {
                 'ubuntu': {
@@ -340,7 +340,7 @@ class TestMissingPackages(object):
 
 
 class TestDistroDefaults(object):
-    def setup(self):
+    def setup_method(self):
         config.use_shaman = False
 
     def test_distro_defaults_saya(self):
index 601a362c72117fa5ee524312353e450024e77b87..2a9a7de0945f333df6dd742fe2db8778e6739109 100644 (file)
@@ -19,7 +19,7 @@ class TestFetchCoreDumps(object):
         def communicate(self, input=None):
             return [TestFetchCoreDumps.MockDecode(self.ret)]
 
-    def setup(self):
+    def setup_method(self):
         self.the_function = fetch_binaries_for_coredumps
         with gzip.open('file.gz', 'wb') as f:
             f.write(b'Hello world!')
index 04a4c122b60d139c707ce0f060f975dc1da965b5..a618c4cf7e3707e2dc563c46cfb4ad51de9468d7 100644 (file)
@@ -7,7 +7,7 @@ from teuthology import suite
 
 
 class TestSuiteOnline(object):
-    def setup(self):
+    def setup_method(self):
         if 'TEST_ONLINE' not in os.environ:
             skip("To run these sets, set the environment variable TEST_ONLINE")
 
index 6fae57a8107ecce4436ffa168f032ece991a5b3d..d000cff8850c4c5e359d9243eb64b40b75fb054c 100644 (file)
@@ -11,7 +11,7 @@ class TestTask(object):
     klass = Task
     task_name = 'task'
 
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.config = dict()
         self.task_config = dict()
index bfef00d174285003f0da34a07045b4bf921f9901..0c58f33b4b2c4400b7e680632522c3067e467d37 100644 (file)
@@ -23,10 +23,7 @@ class TestAnsibleTask(TestTask):
     klass = Ansible
     task_name = 'ansible'
 
-    def setup(self):
-        pass
-
-    def setup_method(self, method):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.cluster = Cluster()
         self.ctx.cluster.add(Remote('user@remote1'), ['role1'])
@@ -505,8 +502,8 @@ class TestCephLabTask(TestAnsibleTask):
     klass = CephLab
     task_name = 'ansible.cephlab'
 
-    def setup(self):
-        super(TestCephLabTask, self).setup()
+    def setup_method(self):
+        super(TestCephLabTask, self).setup_method()
         self.task_config = dict()
 
     def start_patchers(self):
index ff3b2ff6c54a613ce70e9c43a30f3b5e69b74b82..29359c1021e50175aaafbceb86ce5cdeb3cacbd7 100644 (file)
@@ -21,7 +21,7 @@ class TestCephAnsibleTask(TestTask):
     klass = CephAnsible
     task_name = 'ceph_ansible'
 
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.cluster = Cluster()
         self.ctx.cluster.add(Remote('user@remote1'), ['mon.0'])
index 132d503264886eea9a75ce9f22ada7fd814ee349..aeb88b43252633439ab9a4aeabec77c00d5bcbb5 100644 (file)
@@ -15,7 +15,7 @@ class TestConsoleLog(TestTask):
     klass = ConsoleLog
     task_name = 'console_log'
 
-    def setup(self):
+    def setup_method(self):
         teuth_config.ipmi_domain = 'ipmi.domain'
         teuth_config.ipmi_user = 'ipmi_user'
         teuth_config.ipmi_password = 'ipmi_pass'
@@ -45,7 +45,7 @@ class TestConsoleLog(TestTask):
             self.mocks[name] = patcher.start()
         self.mocks['is_vm'].return_value = False
 
-    def teardown(self):
+    def teardown_method(self):
         for patcher in self.patchers.values():
             patcher.stop()
 
index 4d125f5036f03b949ef3773e848fa0a71c506a77..1340b1822267db1d3cd4d865c1da07844ef91b6b 100644 (file)
@@ -3,7 +3,7 @@ from teuthology.task import internal
 
 
 class TestInternal(object):
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.config = dict()
 
index 7be86587dc623ef07bc86f5847aa77059750f96f..593b204fa2732b3e808efc55af25421e8e88b952 100644 (file)
@@ -9,7 +9,7 @@ from teuthology.task.kernel import (
 
 class TestKernelNormalizeAndApplyOverrides(object):
 
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.cluster = Cluster()
         self.ctx.cluster.add(Remote('remote1'), ['mon.a', 'client.0'])
index c70e5445338709a970f1246613695fb14b2d1caa..7777407797ad3d4048a364eea9de316572562cd4 100644 (file)
@@ -21,7 +21,7 @@ pcp_host = 'http://pcp.front.sepia.ceph.com:44323/'
 class TestPCPDataSource(object):
     klass = PCPDataSource
 
-    def setup(self):
+    def setup_method(self):
         config.pcp_host = pcp_host
 
     def test_init(self):
@@ -231,7 +231,7 @@ class TestPCPTask(TestTask):
     klass = PCP
     task_name = 'pcp'
 
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.cluster = Cluster()
         self.ctx.cluster.add(Remote('user@remote1'), ['role1'])
index ddbff06d08a54348c59aa6390e07544d1e2bd0d5..68c8e9c034c525269c2bf0c8d232470c873f8c7f 100644 (file)
@@ -7,7 +7,7 @@ from teuthology.task.selinux import SELinux
 
 
 class TestSELinux(object):
-    def setup(self):
+    def setup_method(self):
         self.ctx = FakeNamespace()
         self.ctx.config = dict()
 
index cbf7c3ecfbb9c676218905944b156bf035bb4bb0..262000890b1882fe7868e6184e598306beea6837 100644 (file)
@@ -4,7 +4,7 @@ from teuthology import config
 
 
 class TestYamlConfig(object):
-    def setup(self):
+    def setup_method(self):
         self.test_class = config.YamlConfig
 
     def test_set_multiple(self):
@@ -79,7 +79,7 @@ class TestYamlConfig(object):
 
 
 class TestTeuthologyConfig(TestYamlConfig):
-    def setup(self):
+    def setup_method(self):
         self.test_class = config.TeuthologyConfig
 
     def test_get_ceph_git_base_default(self):
@@ -112,12 +112,12 @@ class TestTeuthologyConfig(TestYamlConfig):
 
 
 class TestJobConfig(TestYamlConfig):
-    def setup(self):
+    def setup_method(self):
         self.test_class = config.JobConfig
 
 
 class TestFakeNamespace(TestYamlConfig):
-    def setup(self):
+    def setup_method(self):
         self.test_class = config.FakeNamespace
 
     def test_docopt_dict(self):
index d7d1f4323f2cf5fba6f7644a78cc5e50ed4a3075..c433c82c90c4fed83c298e0d9b81b7afda15097d 100644 (file)
@@ -5,7 +5,7 @@ from logging import ERROR
 
 class TestSafeWhile(object):
 
-    def setup(self):
+    def setup_method(self):
         contextutil.log.setLevel(ERROR)
         self.fake_sleep = lambda s: True
         self.s_while = contextutil.safe_while
index c6577d66f3bbda718622811650577d47e43152d4..04d1777022f26ac8255cf397358f500f96846e35 100644 (file)
@@ -129,7 +129,7 @@ expected_rbd_features = [
 
 class TestDescribeTests(object):
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = dict()
         self.patchers = dict()
         exists, listdir, isfile, isdir, open = make_fake_fstools(realistic_fs)
@@ -153,7 +153,7 @@ class TestDescribeTests(object):
         for patcher in self.patchers.values():
             patcher.stop()
 
-    def teardown(self):
+    def teardown_method(self):
         self.stop_patchers()
 
     @staticmethod
index fcc83b697dda741791d42c403738e9d07d5a2c30..60fcd245cf4a0cd972196c12e0ecc54afab3069f 100644 (file)
@@ -6,7 +6,7 @@ from teuthology.run_tasks import build_email_body as email_body
 from textwrap import dedent
 
 class TestSleepBeforeTeardownEmail(object):
-    def setup(self):
+    def setup_method(self):
         config.results_ui_server = "http://example.com/"
         config.archive_server = "http://qa-proxy.ceph.com/teuthology/"
 
index b7004fd75732f85049fb2de76bc5be8d7828ca88..11125b937c5ceae146996d9310a80dc8f39f7b02 100644 (file)
@@ -11,7 +11,7 @@ from teuthology.test import skipif_teuthology_process
 class TestExiter(object):
     klass = exit.Exiter
 
-    def setup(self):
+    def setup_method(self):
         self.pid = os.getpid()
 
         # Below, we patch os.kill() in such a way that the first time it is
@@ -36,7 +36,7 @@ class TestExiter(object):
 
         self.m_kill.side_effect = m_kill_unwrap
 
-    def teardown(self):
+    def teardown_method(self):
         self.patcher_kill.stop()
         del self.m_kill
 
index 71104d39b49a9fb6e50e53d0a21ee0ad83ab06d2..b03ba7b63c3b8460dcb901deffe192784474f57f 100644 (file)
@@ -7,7 +7,7 @@ class Mock:
 
 class TestGetDistro(object):
 
-    def setup(self):
+    def setup_method(self):
         self.fake_ctx = Mock()
         self.fake_ctx.config = {}
         # os_type in ctx will always default to None
index 66a9093b89c97fbac2237ae6874b1a40971c61f5..8a77e39beb2f7cb0db03666eceaa4d0e38f09d3a 100644 (file)
@@ -7,7 +7,7 @@ class Mock:
 
 class TestGetDistroVersion(object):
 
-    def setup(self):
+    def setup_method(self):
         self.fake_ctx = Mock()
         self.fake_ctx.config = {}
         self.fake_ctx_noarg = Mock()
index 97b499f7cb657c02658ceac7be0c880d500fd24f..22341239c9c6e0de896fc5f818b42d1c436649c5 100644 (file)
@@ -251,10 +251,10 @@ def test_split_role():
         assert actual_split == expected_split
 
 class TestHostnames(object):
-    def setup(self):
+    def setup_method(self):
         config._conf = dict()
 
-    def teardown(self):
+    def teardown_method(self):
         config.load()
 
     def test_canonicalize_hostname(self):
index e497bb690704cb546cba41ad28097d58b121a089..265b2f8cfab060ced9cbfa3715c10ee5e39db4da 100644 (file)
@@ -306,7 +306,7 @@ class TestPackaging(object):
 class TestBuilderProject(object):
     klass = None
 
-    def setup(self):
+    def setup_method(self):
         if self.klass is None:
             pytest.skip()
 
@@ -530,7 +530,7 @@ class TestBuilderProject(object):
 class TestShamanProject(TestBuilderProject):
     klass = packaging.ShamanProject
 
-    def setup(self):
+    def setup_method(self):
         self.p_config = patch('teuthology.packaging.config')
         self.m_config = self.p_config.start()
         self.m_config.use_shaman = True
@@ -542,7 +542,7 @@ class TestShamanProject(TestBuilderProject):
         self.p_get = patch('requests.get')
         self.m_get = self.p_get.start()
 
-    def teardown(self):
+    def teardown_method(self):
         self.p_config.stop()
         self.p_get_config_value.stop()
         self.p_get.stop()
index 1a33b12b4b5ff975ba57ad394da80a4413f28c6c..342cebdd0eed0666ee964f296af7bb4818f2da39 100644 (file)
@@ -5,13 +5,13 @@ from teuthology import report
 
 
 class TestSerializer(object):
-    def setup(self):
+    def setup_method(self):
         self.archive = fake_archive.FakeArchive()
         self.archive.setup()
         self.archive_base = self.archive.archive_base
         self.reporter = report.ResultsReporter(archive_base=self.archive_base)
 
-    def teardown(self):
+    def teardown_method(self):
         self.archive.teardown()
 
     def test_all_runs_one_run(self):
index f1dc58747c2f9119ddff4d146b160a01dd73a6be..3d7ba93bdce6505b3aa9399ca0ba9001ded650a8 100644 (file)
@@ -137,7 +137,7 @@ class TestResultsEmail(object):
     """).strip(),
     }
 
-    def setup(self):
+    def setup_method(self):
         config.results_ui_server = "http://example.com/"
         config.archive_server = "http://qa-proxy.ceph.com/teuthology/"
 
index 43ad5ae303325aac05274948d50b902151f7efb9..7a4cfd32fa5a04af517b611638fbe4af2a776d1a 100644 (file)
@@ -6,7 +6,7 @@ from teuthology import provision
 
 class TestVpsOsVersionParamCheck(object):
 
-    def setup(self):
+    def setup_method(self):
         self.fake_ctx = Mock()
         self.fake_ctx.machine_type = 'vps'
         self.fake_ctx.num_to_lock = 1
index 87d3af88ca844310d0dff1add72e999c5d16bd08..877d9903d795d44e48b47267e4e9923357a81c1e 100644 (file)
@@ -10,7 +10,7 @@ from teuthology.contextutil import MaxWhileTries
 
 
 class TestWorker(object):
-    def setup(self):
+    def setup_method(self):
         self.ctx = Mock()
         self.ctx.verbose = True
         self.ctx.archive_dir = '/archive/dir'