Cancel transactions when exceptions are raised.

[ira/wip.git] / source4 / scripting / python / samba / tests / samdb.py

diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index fcf93a3fc6f5b68d975abdd508cf73311ca38272..161f9f4f652bac47af97059edac8700a565088f0 100644 (file)
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -22,12 +22,13 @@ import os
 from samba.provision import setup_samdb, guess_names, setup_templatesdb, make_smbconf
 from samba.samdb import SamDB
 from samba.tests import cmdline_loadparm, TestCaseInTempDir
-from samba import security
+from samba.dcerpc import security
 from unittest import TestCase
 import uuid
-import param
+from samba import param
 
 class SamDBTestCase(TestCaseInTempDir):
+
     def setUp(self):
         super(SamDBTestCase, self).setUp()
         invocationid = str(uuid.uuid4())
@@ -59,7 +60,7 @@ class SamDBTestCase(TestCaseInTempDir):
 
         names = guess_names(lp=lp, hostname=hostname, 
                             domain=domain, dnsdomain=dnsdomain, 
-                            serverrole=severrole, 
+                            serverrole=serverrole, 
                             domaindn=self.domaindn, configdn=configdn, 
                             schemadn=schemadn)
         setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"),