tests/krb5: Move TestCaseInTempDir to more appropriate place in class hierarchy

KDCBaseTest is the only class that makes use of it.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 8c258fe711ce585dd43e40b83430cd3bb019f0a9..b8412cd57ff1a2d9f2998955c6ea28a100c72f9d 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -95,7 +95,7 @@ from samba.samdb import SamDB, dsdb_Dn
 rc4_bit = security.KERB_ENCTYPE_RC4_HMAC_MD5
 aes256_sk_bit = security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK
 
-from samba.tests import delete_force
+from samba.tests import TestCaseInTempDir, delete_force
 import samba.tests.krb5.kcrypto as kcrypto
 from samba.tests.krb5.raw_testcase import (
     KerberosCredentials,
@@ -144,7 +144,7 @@ class Principal:
         self.sid = sid
 
 
-class KDCBaseTest(RawKerberosTest):
+class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
     """ Base class for KDC tests.
     """
 

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index e9e882334b49ce1750ee98889c532a81d281ab42..889a29a38c8e6d33d713c05dbf563457db5e2b70 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -48,7 +48,7 @@ from samba.dcerpc.misc import (
 )
 
 import samba.tests
-from samba.tests import TestCaseInTempDir
+from samba.tests import TestCase
 
 import samba.tests.krb5.rfc4120_pyasn1 as krb5_asn1
 from samba.tests.krb5.rfc4120_constants import (
@@ -555,7 +555,7 @@ class KerberosTicketCreds:
         self.sname = sname
 
 
-class RawKerberosTest(TestCaseInTempDir):
+class RawKerberosTest(TestCase):
     """A raw Kerberos Test case."""
 
     class KpasswdMode(Enum):