Imported Debian patch 4.7.2-3

ipatests/test_xmlrpc/test_add_remove_cert_cmd.py

@@ -16,24 +16,24 @@ from ipatests.test_xmlrpc.tracker.idview_plugin import IdviewTracker
 
 
 @pytest.fixture(scope='class')
-def idview(request, xmlrpc_setup):
+def idview(request):
     tracker = IdviewTracker(cn=u'MyView')
     return tracker.make_fixture(request)
 
 
 @pytest.fixture(scope='class')
-def testuser(request, xmlrpc_setup):
+def testuser(request):
     tracker = UserTracker(name=u'testuser', givenname=u'John', sn=u'Donne')
     return tracker.make_fixture(request)
 
 
 @pytest.fixture(scope='class')
-def cert1(request, xmlrpc_setup):
+def cert1(request):
     return get_testcert(DN(('CN', u'testuser')), u'testuser')
 
 
 @pytest.fixture(scope='class')
-def cert2(request, xmlrpc_setup):
+def cert2(request):
     return get_testcert(DN(('CN', u'testuser')), u'testuser')
 
 
@@ -52,15 +52,6 @@ class CertManipCmdTestBase(XMLRPC_test):
         entity_add=None,
         caacl=None,
     )
-
-    certs = None
-    certs_remainder = None
-    certs_subset = None
-    invalid_b64 = None
-    malformed_cert = None
-    mixed_certs = None
-    nonexistent_certs = None
-
     cert_add_cmd = None
     cert_del_cmd = None
 
@@ -109,9 +100,9 @@ class CertManipCmdTestBase(XMLRPC_test):
     def remove_caacl(cls):
         pass
 
-    @pytest.fixture(autouse=True, scope="class")
-    def certmanipcmd_setup(self, request, xmlrpc_setup):
-        cls = request.cls
+    @classmethod
+    def setup_class(cls):
+        super(CertManipCmdTestBase, cls).setup_class()
 
         cls.delete_entity()
 
@@ -224,15 +215,16 @@ class CertManipCmdTestBase(XMLRPC_test):
         cls.malformed_cert = [base64.b64encode(b'malformed cert')]
 
         # store entity info for the final test
-        cls.entity_attrs = api.Command[
-            '%s_show' % cls.entity_class](cls.entity_pkey)
+        cls.entity_attrs = api.Command['%s_show' % cls.entity_class](
+            cls.entity_pkey)
 
-        def fin():
-            cls.delete_entity()
-            cls.remove_caacl()
-            cls.restore_profile_store()
+    @classmethod
+    def teardown_class(cls):
+        cls.delete_entity()
+        cls.remove_caacl()
 
-        request.addfinalizer(fin)
+        cls.restore_profile_store()
+        super(CertManipCmdTestBase, cls).teardown_class()
 
     def add_certs(self, certs):
         # pylint: disable=E1102