python/samba/tests/krb5: Move get_kpasswd_sname() into raw_testcase() to allow broade...

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

diff --git a/python/samba/tests/krb5/kpasswd_tests.py b/python/samba/tests/krb5/kpasswd_tests.py
index 0f1fe656f4972f3699014d045cd853c77e45d7d6..6f0b36a25f631ce30e53d9b04cb7f92155db1035 100755 (executable)
--- a/python/samba/tests/krb5/kpasswd_tests.py
+++ b/python/samba/tests/krb5/kpasswd_tests.py
@@ -90,10 +90,6 @@ class KpasswdTests(KDCBaseTest):
 
         return creds
 
-    def get_kpasswd_sname(self):
-        return self.PrincipalName_create(name_type=NT_PRINCIPAL,
-                                         names=['kadmin', 'changepw'])
-
     def get_ticket_lifetime(self, ticket):
         enc_part = ticket.ticket_private
 

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index ef9498cd251af4792d48d7385a89d8ff956e7b28..75ba6d44d485f1d51b1fb3ddf39acfd26a48c714 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -6054,6 +6054,10 @@ class RawKerberosTest(TestCase):
 
         return krbtgt_sname
 
+    def get_kpasswd_sname(self):
+        return self.PrincipalName_create(name_type=NT_PRINCIPAL,
+                                         names=['kadmin', 'changepw'])
+
     def add_requester_sid(self, pac, sid):
         pac_buffers = pac.buffers