summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-06-25 13:26:06 +0200
committerStefan Metzmacher <metze@samba.org>2010-07-10 11:18:19 +0200
commit800c7af0c9f78ce81d40270bf9a385235869e0d7 (patch)
treebf1b663dec6023c6c8b786b23aebe937a7aedce5 /source4
parentf16007430a683c0e43e1aca13f59c55dde70dfac (diff)
downloadsamba-800c7af0c9f78ce81d40270bf9a385235869e0d7.tar.gz
samba-800c7af0c9f78ce81d40270bf9a385235869e0d7.tar.bz2
samba-800c7af0c9f78ce81d40270bf9a385235869e0d7.zip
s4:provision: also use fixed GUID names of the default group policies for domain and domain controllers in tests
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/tests/samdb.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 28745a2ce3..34c5c1a769 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -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,