Imported Debian patch 4.7.2-3

ipatests/test_ipaserver/test_secrets.py

@@ -6,8 +6,7 @@ import os
 import shutil
 import subprocess
 import tempfile
-
-import pytest
+import unittest
 
 
 def _test_password_callback():
@@ -16,13 +15,9 @@ def _test_password_callback():
     return password
 
 
-class TestiSecStore:
-    certdb = None
-    cert2db = None
-
-    @pytest.fixture(autouse=True, scope="class")
-    def isec_store_setup(self, request):
-        cls = request.cls
+class TestiSecStore(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
         cls.testdir = tempfile.mkdtemp(suffix='ipa-sec-store')
         pwfile = os.path.join(cls.testdir, 'pwfile')
         with open(pwfile, 'w') as f:
@@ -50,9 +45,9 @@ class TestiSecStore:
             cwd=cls.testdir
         )
 
-        def fin():
-            shutil.rmtree(cls.testdir)
-        request.addfinalizer(fin)
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.testdir)
 
     def test_iSecStore(self):
         iss = iSecStore({})