[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  f992dbb s4-tests: Modified descriptor tests to use pyldb api to retrieve configuration and schema dn.
       via  b397a13 s4-tests: Modified acl tests to use pyldb api to retrieve configuration dn.
      from  0f6a4a2 Make 'net rpc printer driver' behave the same as rpcclient enumdrivers when dealing with unsupported architectures.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f992dbb9cade1a5ef6ee03f0ea5c378928be3b64
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Thu Nov 18 20:44:22 2010 +0200

    s4-tests: Modified descriptor tests to use pyldb api to retrieve configuration and schema dn.
    
    Autobuild-User: Nadezhda Ivanova <nivanova at samba.org>
    Autobuild-Date: Thu Nov 18 22:25:07 CET 2010 on sn-devel-104

commit b397a139203781d7df9992a821b1c6c6849c42cf
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Thu Nov 18 20:43:16 2010 +0200

    s4-tests: Modified acl tests to use pyldb api to retrieve configuration dn.

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/tests/python/acl.py            |    4 +---
 source4/dsdb/tests/python/sec_descriptor.py |   14 ++------------
 2 files changed, 3 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 2f9cf64..1480005 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -74,9 +74,7 @@ class AclTests(samba.tests.TestCase):
         self.base_dn = ldb.domain_dn()
         self.domain_sid = self.find_domain_sid(self.ldb_admin)
         self.user_pass = "samba123@"
-        res = self.ldb_admin.search(base="", expression="", scope=SCOPE_BASE,
-                 attrs=["configurationNamingContext"])
-        self.configuration_dn = res[0]["configurationNamingContext"][0]
+        self.configuration_dn = self.ldb_admin.get_config_basedn().get_linearized()
         print "baseDN: %s" % self.base_dn
 
     def get_user_dn(self, name):
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 175cc81..b61afd3 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -65,16 +65,6 @@ class DescriptorTests(samba.tests.TestCase):
         except LdbError, (num, _):
             self.assertEquals(num, ERR_NO_SUCH_OBJECT)
 
-    def find_configurationdn(self, ldb):
-        res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["configurationNamingContext"])
-        self.assertEquals(len(res), 1)
-        return res[0]["configurationNamingContext"][0]
-
-    def find_schemadn(self, ldb):
-        res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["schemaNamingContext"])
-        self.assertEquals(len(res), 1)
-        return res[0]["schemaNamingContext"][0]
-
     def find_domain_sid(self, ldb):
         res = ldb.search(base=self.base_dn, expression="(objectClass=*)", scope=SCOPE_BASE)
         return ndr_unpack( security.dom_sid,res[0]["objectSid"][0])
@@ -263,8 +253,8 @@ url: www.example.com
         super(DescriptorTests, self).setUp()
         self.ldb_admin = ldb
         self.base_dn = ldb.domain_dn()
-        self.configuration_dn = self.find_configurationdn(self.ldb_admin)
-        self.schema_dn = self.find_schemadn(self.ldb_admin)
+        self.configuration_dn = self.ldb_admin.get_config_basedn().get_linearized()
+        self.schema_dn = self.ldb_admin.get_schema_basedn().get_linearized()
         self.domain_sid = self.find_domain_sid(self.ldb_admin)
         print "baseDN: %s" % self.base_dn
 


-- 
Samba Shared Repository