Fix samdb python test.

diff --git a/source/samba4-skip b/source/samba4-skip
index ed547ba72dbee165d069197dab86daf54601b9f9..7a6c54e9ec144e1b4dfb1e1532072a30adb6485f 100644 (file)
--- a/source/samba4-skip
+++ b/source/samba4-skip
@@ -2,9 +2,10 @@
 # should be skipped during "make test".
 #
 # Possible reasons for adding a testsuite here:
-# * Tests functionality not implemented on the server side
+# * Testsuite functionality not implemented on the server side
 # * Testsuite crashes during run
 # * Testsuite crashes server
+# * Testsuite contains "flapping" tests (sometimes success, sometimes failure)
 #
 # If a testsuite is partially succeeding, please list the failing bits 
 # in the samba4-knownfail file rather than disabling the testsuite completely.
@@ -61,4 +62,4 @@ nss.test                                              # Fails
 samba4.samba3sam.python                # Conversion from EJS not yet finished
 raw.offline                    # Samba 4 doesn't have much offline support yet
 winreg*  #Does not authenticate against the target server
-^samba4.samdb.python  #Not working yet
+#^samba4.samdb.python  #Not working yet

diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index b7112e16c34db28e1534fd71ed158b81599dfbb5..3f936c3301cc2de98bc406c8fc3624c154d0cb9e 100644 (file)
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -1321,12 +1321,12 @@ def create_zone_file(path, setup_path, dnsdomain, domaindn,
     """
     assert isinstance(domainguid, str)
 
-    hostip6_base_line = ""
-    hostip6_host_line = ""
-
     if hostip6 is not None:
         hostip6_base_line = "            IN AAAA    " + hostip6
         hostip6_host_line = hostname + "        IN AAAA    " + hostip6
+    else:
+        hostip6_base_line = ""
+        hostip6_host_line = ""
 
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),

diff --git a/source/scripting/python/samba/tests/samdb.py b/source/scripting/python/samba/tests/samdb.py
index fcf93a3fc6f5b68d975abdd508cf73311ca38272..97be5672ce838c4d00fe3e0dd3c8a2abf9fb8e45 100644 (file)
--- a/source/scripting/python/samba/tests/samdb.py
+++ b/source/scripting/python/samba/tests/samdb.py
@@ -25,7 +25,7 @@ from samba.tests import cmdline_loadparm, TestCaseInTempDir
 from samba import security
 from unittest import TestCase
 import uuid
-import param
+from samba import param
 
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
@@ -59,7 +59,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"),