[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1937-g6b202d3

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  6b202d3780f8ff50e0bdfa4a749c43b5639e4880 (commit)
       via  064e9ddb3786bd7df8785b39754b1e6674496b66 (commit)
       via  c338269b4b9f2bf4d3386880c1d733a8e47e2c8d (commit)
      from  3947327f8c4ca530d99bc5ac3d1f6f54727f477a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 6b202d3780f8ff50e0bdfa4a749c43b5639e4880
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 29 17:38:12 2008 +0200

    Fix samdb test and enable it.

commit 064e9ddb3786bd7df8785b39754b1e6674496b66
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 29 17:31:16 2008 +0200

    Update after changes to the provision API, make sure temp dir gets cleaned
    up.

commit c338269b4b9f2bf4d3386880c1d733a8e47e2c8d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 29 17:29:56 2008 +0200

    Check test directory is cleaned up by Python tests.

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

Summary of changes:
 source/samba4-skip                              |    1 -
 source/scripting/python/samba/tests/__init__.py |    1 +
 source/scripting/python/samba/tests/samdb.py    |   35 +++++++++++++++-------
 source/selftest/samba4_tests.sh                 |    2 +-
 4 files changed, 26 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/samba4-skip b/source/samba4-skip
index 4ac35a3..de572ed 100644
--- a/source/samba4-skip
+++ b/source/samba4-skip
@@ -49,6 +49,5 @@ samba4.ntvfs.cifs.raw.
 ^samba4.net.api.become.dc.*$			# Fails
 nss.test						# Fails
 samba4.samba3sam.python		# Conversion from EJS not yet finished
-samba4.samdb.python			# Not finished yet
 raw.offline 			# Samba 4 doesn't have much offline support yet
 winreg*  #Does not authenticate against the target server
diff --git a/source/scripting/python/samba/tests/__init__.py b/source/scripting/python/samba/tests/__init__.py
index e29b4a8..d827bfa 100644
--- a/source/scripting/python/samba/tests/__init__.py
+++ b/source/scripting/python/samba/tests/__init__.py
@@ -47,6 +47,7 @@ class TestCaseInTempDir(unittest.TestCase):
 
     def tearDown(self):
         super(TestCaseInTempDir, self).tearDown()
+        self.assertEquals([], os.listdir(self.tempdir))
         os.rmdir(self.tempdir)
 
 
diff --git a/source/scripting/python/samba/tests/samdb.py b/source/scripting/python/samba/tests/samdb.py
index 0d4f7bd..7e8ba05 100644
--- a/source/scripting/python/samba/tests/samdb.py
+++ b/source/scripting/python/samba/tests/samdb.py
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from auth import system_session
-from credentials import Credentials
+from samba.auth import system_session
+from samba.credentials import Credentials
 import os
-from samba.provision import setup_samdb
+from samba.provision import setup_samdb, guess_names, setup_templatesdb
 from samba.samdb import SamDB
 from samba.tests import cmdline_loadparm, TestCaseInTempDir
-import security
+from samba import security
 from unittest import TestCase
 import uuid
 
@@ -42,14 +42,27 @@ class SamDBTestCase(TestCaseInTempDir):
         domainsid = security.random_sid()
         hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
-        self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
-                                 cmdline_loadparm, schemadn, configdn, 
-                                 self.domaindn, "example.com", "EXAMPLE.COM", 
-                                 "FOO", lambda x: None, "foo", domaindn, 
-                                 False, domainsid, "# no aci", domainguid, 
-                                 policyguid, "EXAMPLE", True, "secret", 
-                                 "secret", "secret", hostguid, invocationid, 
+        session_info = system_session()
+        names = guess_names(lp=cmdline_loadparm, hostname="foo", 
+                            domain="EXAMPLE.COM", dnsdomain="example.com", 
+                            serverrole="domain controller", 
+                            domaindn=self.domaindn, configdn=configdn, 
+                            schemadn=schemadn)
+        setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"), 
+                          setup_path, session_info=session_info, 
+                          credentials=creds, lp=cmdline_loadparm)
+        self.samdb = setup_samdb(path, setup_path, session_info, creds, 
+                                 cmdline_loadparm, names, 
+                                 lambda x: None, domainsid, 
+                                 "# no aci", domainguid, 
+                                 policyguid, False, "secret", 
+                                 "secret", "secret", invocationid, 
                                  "secret", "domain controller")
+    def tearDown(self):
+        for f in ['templates.ldb', 'schema.ldb', 'configuration.ldb', 
+                  'users.ldb', 'samdb.ldb']:
+            os.remove(os.path.join(self.tempdir, f))
+        super(SamDBTestCase, self).tearDown()
 
     def test_add_foreign(self):
         self.samdb.add_foreign(self.domaindn, "S-1-5-7", "Somedescription")
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 1771a0d..9693451 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -340,8 +340,8 @@ plantest "provision.python" none $SUBUNITRUN samba.tests.provision
 plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
 plantest "samr.python" dc $SUBUNITRUN samba.tests.dcerpc.sam
 plantest "dcerpc.bare.python" dc $SUBUNITRUN samba.tests.dcerpc.bare
-plantest "samdb.python" dc $SUBUNITRUN samba.tests.samdb
 plantest "unixinfo.python" dc $SUBUNITRUN samba.tests.dcerpc.unix
+plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
 plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
 plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:lib/messaging/tests" $SUBUNITRUN bindings
 plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam


-- 
Samba Shared Repository