diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-06-21 20:19:02 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-06-23 20:10:03 +1000 |
| commit | c4482bf53e26c43edccb0871fa5525a590a1026c (patch) | |
| tree | 37364ab94d8501b268a3ebd0bc213782f6066c4c /source4/lib/ldb/tests/python | |
| parent | 80701e5f29567e4ad75a66eb6c8711f817b361b8 (diff) | |
| download | samba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.gz samba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.bz2 samba-c4482bf53e26c43edccb0871fa5525a590a1026c.zip | |
libds:common Remove DS_DC_* domain functionality flags
These are just a subset of the DS_DOMAIN_ functionality flags, are compared and often confused with each other. Just make them one set.
Andrew Bartlett
Diffstat (limited to 'source4/lib/ldb/tests/python')
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap_schema.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py index 8e6865a4d2..8d1f0d00f4 100755 --- a/source4/lib/ldb/tests/python/ldap_schema.py +++ b/source4/lib/ldb/tests/python/ldap_schema.py @@ -20,7 +20,7 @@ from ldb import ERR_CONSTRAINT_VIOLATION from ldb import Message, MessageElement, Dn from ldb import FLAG_MOD_REPLACE from samba import Ldb -from samba.dsdb import DS_DC_FUNCTION_2003 +from samba.dsdb import DS_DOMAIN_FUNCTION_2003 from subunit.run import SubunitTestRunner import unittest @@ -278,7 +278,7 @@ systemOnly: FALSE # 1. Create attribute without systemFlags # msDS-IntId should be created if forest functional - # level is >= DS_DC_FUNCTION_2003 + # level is >= DS_DOMAIN_FUNCTION_2003 # and missing otherwise (attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-1-") ldif = self._make_attr_ldif(attr_name, attr_dn) @@ -300,7 +300,7 @@ systemOnly: FALSE res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) - if self.forest_level >= DS_DC_FUNCTION_2003: + if self.forest_level >= DS_DOMAIN_FUNCTION_2003: if self._is_schema_base_object(res[0]): self.assertTrue("msDS-IntId" not in res[0]) else: @@ -319,7 +319,7 @@ systemOnly: FALSE # 2. Create attribute with systemFlags = FLAG_SCHEMA_BASE_OBJECT # msDS-IntId should be created if forest functional - # level is >= DS_DC_FUNCTION_2003 + # level is >= DS_DOMAIN_FUNCTION_2003 # and missing otherwise (attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-2-") ldif = self._make_attr_ldif(attr_name, attr_dn) @@ -342,7 +342,7 @@ systemOnly: FALSE res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) - if self.forest_level >= DS_DC_FUNCTION_2003: + if self.forest_level >= DS_DOMAIN_FUNCTION_2003: if self._is_schema_base_object(res[0]): self.assertTrue("msDS-IntId" not in res[0]) else: @@ -384,7 +384,7 @@ systemOnly: FALSE # 1. Create Class without systemFlags # msDS-IntId should be created if forest functional - # level is >= DS_DC_FUNCTION_2003 + # level is >= DS_DOMAIN_FUNCTION_2003 # and missing otherwise (class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-1-") ldif = self._make_class_ldif(class_dn, class_name) @@ -421,7 +421,7 @@ systemOnly: FALSE # 2. Create Class with systemFlags = FLAG_SCHEMA_BASE_OBJECT # msDS-IntId should be created if forest functional - # level is >= DS_DC_FUNCTION_2003 + # level is >= DS_DOMAIN_FUNCTION_2003 # and missing otherwise (class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-3-") ldif = self._make_class_ldif(class_dn, class_name) @@ -469,7 +469,7 @@ systemOnly: FALSE attrs=["systemFlags", "msDS-IntId", "attributeID", "cn"]) self.assertTrue(len(res) > 1) for ldb_msg in res: - if self.forest_level >= DS_DC_FUNCTION_2003: + if self.forest_level >= DS_DOMAIN_FUNCTION_2003: if self._is_schema_base_object(ldb_msg): self.assertTrue("msDS-IntId" not in ldb_msg) else: |