tests: Use PEP8-compliant setup/teardown method names

The setUp/dearDown names are used in the unittest module, but there is no reason
to use them in non-`unittest` test cases.
Nose supports both styles (but mixing them can cause trouble when
calling super()'s methods).
Pytest only supports the new ones.

https://fedorahosted.org/freeipa/ticket/4610

Reviewed-By: Tomas Babej <tbabej@redhat.com>

9 files changed, 28 insertions, 28 deletions

diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index af9994430..a19032503 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -70,8 +70,8 @@ def is_db_configured():
 class test_cert(XMLRPC_test):
 
     @classmethod
-    def setUpClass(cls):
-        super(test_cert, cls).setUpClass()
+    def setup_class(cls):
+        super(test_cert, cls).setup_class()
 
         if 'cert_request' not in api.Command:
             raise nose.SkipTest('cert_request not registered')
@@ -83,8 +83,8 @@ class test_cert(XMLRPC_test):
         new_args = new_args + args
         return ipautil.run(new_args, stdin)
 
-    def setUp(self):
-        super(test_cert, self).setUp()
+    def setup(self):
+        super(test_cert, self).setup()
         self.reqdir = tempfile.mkdtemp(prefix = "tmp-")
         self.reqfile = self.reqdir + "/test.csr"
         self.pwname = self.reqdir + "/pwd"
@@ -99,8 +99,8 @@ class test_cert(XMLRPC_test):
 
         self.subject = DN(('CN', self.host_fqdn), x509.subject_base())
 
-    def tearDown(self):
-        super(test_cert, self).tearDown()
+    def teardown(self):
+        super(test_cert, self).teardown()
         shutil.rmtree(self.reqdir, ignore_errors=True)
 
     def generateCSR(self, subject):
@@ -204,8 +204,8 @@ class test_cert(XMLRPC_test):
 class test_cert_find(XMLRPC_test):
 
     @classmethod
-    def setUpClass(cls):
-        super(test_cert_find, cls).setUpClass()
+    def setup_class(cls):
+        super(test_cert_find, cls).setup_class()
 
         if 'cert_find' not in api.Command:
             raise nose.SkipTest('cert_find not registered')
diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index fb5385314..6edf691f1 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -334,8 +334,8 @@ if have_ldap2:
 class test_dns(Declarative):
 
     @classmethod
-    def setUpClass(cls):
-        super(test_dns, cls).setUpClass()
+    def setup_class(cls):
+        super(test_dns, cls).setup_class()
 
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect(fallback=False)
@@ -3726,8 +3726,8 @@ zone_root_permission_dn = DN(('cn', zone_root_permission),
 class test_root_zone(Declarative):
 
     @classmethod
-    def setUpClass(cls):
-        super(test_root_zone, cls).setUpClass()
+    def setup_class(cls):
+        super(test_root_zone, cls).setup_class()
 
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect(fallback=False)
diff --git a/ipatests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py
index a2128cb77..83d4d134f 100644
--- a/ipatests/test_xmlrpc/test_external_members.py
+++ b/ipatests/test_xmlrpc/test_external_members.py
@@ -43,8 +43,8 @@ def get_trusted_group_name():
 
 class test_external_members(Declarative):
     @classmethod
-    def setUpClass(cls):
-        super(test_external_members, cls).setUpClass()
+    def setup_class(cls):
+        super(test_external_members, cls).setup_class()
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect(fallback=False)
 
diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py
index 67acb765f..afc1e76ed 100644
--- a/ipatests/test_xmlrpc/test_host_plugin.py
+++ b/ipatests/test_xmlrpc/test_host_plugin.py
@@ -980,7 +980,7 @@ class test_host_false_pwd_change(XMLRPC_test):
     command = "ipa-client/ipa-join"
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         [cls.keytabfd,cls.keytabname] = tempfile.mkstemp()
         os.close(cls.keytabfd)
 
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index f58fa88ca..9946378fb 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -3164,8 +3164,8 @@ class test_managed_permissions(Declarative):
     ]
 
     @classmethod
-    def setUpClass(cls):
-        super(test_managed_permissions, cls).setUpClass()
+    def setup_class(cls):
+        super(test_managed_permissions, cls).setup_class()
 
         if not have_ldap2:
             raise nose.SkipTest('server plugin not available')
diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
index ae8450f99..08f7cfac2 100644
--- a/ipatests/test_xmlrpc/test_range_plugin.py
+++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -385,9 +385,9 @@ group1_gid = id_shift + 900100
 
 class test_range(Declarative):
     @classmethod
-    def setUpClass(cls):
-        super(test_range, cls).setUpClass()
-        cls.tearDownClass()
+    def setup_class(cls):
+        super(test_range, cls).setup_class()
+        cls.teardown_class()
         cls.mockldap = MockLDAP()
         cls.mockldap.add_entry(trust_container_dn, trust_container_add)
         cls.mockldap.add_entry(smb_cont_dn, smb_cont_add)
@@ -412,7 +412,7 @@ class test_range(Declarative):
         cls.mockldap.unbind()
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         cls.mockldap = MockLDAP()
 
         cls.mockldap.del_entry(domain2_dn)
diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py
index 5260b4061..94e4efc93 100644
--- a/ipatests/test_xmlrpc/test_trust_plugin.py
+++ b/ipatests/test_xmlrpc/test_trust_plugin.py
@@ -39,8 +39,8 @@ default_group_dn = DN(('cn', default_group), api.env.container_group, api.env.ba
 class test_trustconfig(Declarative):
 
     @classmethod
-    def setUpClass(cls):
-        super(test_trustconfig, cls).setUpClass()
+    def setup_class(cls):
+        super(test_trustconfig, cls).setup_class()
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect(fallback=False)
         try:
diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py
index dfca104eb..304a6d992 100644
--- a/ipatests/test_xmlrpc/test_user_plugin.py
+++ b/ipatests/test_xmlrpc/test_user_plugin.py
@@ -1607,8 +1607,8 @@ class test_denied_bind_with_expired_principal(XMLRPC_test):
     password = u'random'
 
     @classmethod
-    def setUpClass(cls):
-        super(test_denied_bind_with_expired_principal, cls).setUpClass()
+    def setup_class(cls):
+        super(test_denied_bind_with_expired_principal, cls).setup_class()
 
         cls.connection = ldap.initialize('ldap://{host}'
                                          .format(host=api.env.host))
diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py
index f60e30412..2030f1cb2 100644
--- a/ipatests/test_xmlrpc/xmlrpc_test.py
+++ b/ipatests/test_xmlrpc/xmlrpc_test.py
@@ -168,16 +168,16 @@ class XMLRPC_test(object):
     """
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         if not server_available:
             raise nose.SkipTest('%r: Server not available: %r' %
                                 (cls.__module__, api.env.xmlrpc_uri))
 
-    def setUp(self):
+    def setup(self):
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect(fallback=False)
 
-    def tearDown(self):
+    def teardown(self):
         """
         nose tear-down fixture.
         """