tests/krb5/kdc_base_test.py: Remove 'credentials' class attribute

Credentials for tests are now obtained using the get_user_creds()
method.

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

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index b191f905366dd38447c7b26b2718cff1df191dbd..f3c6b37d29fcd35c895ca9b83ef4a6677c99afaa 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -67,28 +67,8 @@ class KDCBaseTest(RawKerberosTest):
     @classmethod
     def setUpClass(cls):
         cls.lp = cls.get_loadparm(cls)
-        cls.username = os.environ["USERNAME"]
-        cls.password = os.environ["PASSWORD"]
         cls.host = os.environ["SERVER"]
 
-        c = Credentials()
-        c.set_username(cls.username)
-        c.set_password(cls.password)
-        try:
-            realm = os.environ["REALM"]
-            c.set_realm(realm)
-        except KeyError:
-            pass
-        try:
-            domain = os.environ["DOMAIN"]
-            c.set_domain(domain)
-        except KeyError:
-            pass
-
-        c.guess()
-
-        cls.credentials = c
-
         cls._ldb = None
 
         # A set containing DNs of accounts created as part of testing.
@@ -111,10 +91,12 @@ class KDCBaseTest(RawKerberosTest):
 
     def get_samdb(self):
         if self._ldb is None:
+            creds = self.get_user_creds()
+
             session = system_session()
             type(self)._ldb = SamDB(url="ldap://%s" % self.host,
                             session_info=session,
-                            credentials=self.credentials,
+                            credentials=creds,
                             lp=self.lp)
 
         return self._ldb

diff --git a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
index 63f67b09c4c663bbd80221505f83892210adf5ec..e9d251e72f6ccb35135307856a1fe0769770d7ef 100755 (executable)
--- a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+++ b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
@@ -211,7 +211,7 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest):
         samdb = self.get_samdb()
         user_name = "mskileusr"
         upn_name = "mskileupn"
-        upn = upn_name + "@" + self.credentials.get_realm().lower()
+        upn = upn_name + "@" + self.get_user_creds().get_realm().lower()
         (uc, dn) = self.create_account(samdb, user_name, upn=upn)
         realm = uc.get_realm().lower()
 
@@ -455,7 +455,7 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest):
         samdb = self.get_samdb()
         user_name = "mskileusr"
         upn_name = "mskileupn"
-        upn = upn_name + "@" + self.credentials.get_realm().lower()
+        upn = upn_name + "@" + self.get_user_creds().get_realm().lower()
         (uc, dn) = self.create_account(samdb, user_name, upn=upn)
         realm = uc.get_realm().lower()