summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/samba4-skip5
-rw-r--r--source4/scripting/python/samba/provision.py6
-rw-r--r--source4/scripting/python/samba/tests/samdb.py4
3 files changed, 8 insertions, 7 deletions
diff --git a/source4/samba4-skip b/source4/samba4-skip
index ed547ba72d..7a6c54e9ec 100644
--- a/source4/samba4-skip
+++ b/source4/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/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b7112e16c3..3f936c3301 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/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/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index fcf93a3fc6..97be5672ce 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/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"),