s4:provision: also use fixed GUID names of the default group policies for domain...
authorStefan Metzmacher <metze@samba.org>
Fri, 25 Jun 2010 11:26:06 +0000 (13:26 +0200)
committerStefan Metzmacher <metze@samba.org>
Sat, 10 Jul 2010 09:18:19 +0000 (11:18 +0200)
metze

source4/scripting/python/samba/tests/samdb.py

index 28745a2ce374650dacfaa85f5dd61f7e961c6e9d..34c5c1a769f2031be2d9d7f075ec0758b906de13 100644 (file)
@@ -22,6 +22,7 @@ import uuid
 
 from samba.auth import system_session
 from samba.provision import setup_samdb, guess_names, make_smbconf, find_setup_dir, provision_paths_from_lp
+from samba.provision import DEFAULT_POLICY_GUID, DEFAULT_DC_POLICY_GUID
 from samba.provisionbackend import ProvisionBackend
 from samba.tests import TestCaseInTempDir
 from samba.dcerpc import security
@@ -47,7 +48,7 @@ class SamDBTestCase(TestCaseInTempDir):
         configdn = "CN=Configuration," + domaindn
         schemadn = "CN=Schema," + configdn
         domainguid = str(uuid.uuid4())
-        policyguid = str(uuid.uuid4())
+        policyguid = DEFAULT_POLICY_GUID
         domainsid = security.random_sid()
         path = os.path.join(self.tempdir, "samdb.ldb")
         session_info = system_session()
@@ -56,7 +57,7 @@ class SamDBTestCase(TestCaseInTempDir):
         domain="EXAMPLE"
         dnsdomain="example.com" 
         serverrole="domain controller"
-        policyguid_dc = str(uuid.uuid4()).upper()
+        policyguid_dc = DEFAULT_DC_POLICY_GUID
 
         smbconf = os.path.join(self.tempdir, "smb.conf")
         make_smbconf(smbconf, self.setup_path, hostname, domain, dnsdomain,