summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xlib/ldb/tests/python/api.py2
-rw-r--r--python/samba/netcmd/fsmo.py4
-rw-r--r--python/samba/netcmd/gpo.py2
-rw-r--r--python/samba/tests/samba_tool/gpo.py28
-rwxr-xr-xsource3/script/tests/test_smbcquota.py4
-rwxr-xr-xsource4/dsdb/tests/python/confidential_attr.py2
-rw-r--r--source4/torture/drs/python/drs_base.py4
-rwxr-xr-xwintest/test-s4-howto.py28
8 files changed, 37 insertions, 37 deletions
diff --git a/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
index e304bb2d043..37e8f4da656 100755
--- a/lib/ldb/tests/python/api.py
+++ b/lib/ldb/tests/python/api.py
@@ -1327,7 +1327,7 @@ class SearchTests(LdbBaseTest):
try:
res11 = self.l.search(base="DC=SAMBA,DCXXXX",
- scope=ldb.SCOPE_ONELEVEL)
+ scope=ldb.SCOPE_ONELEVEL)
self.fail("Should have failed with ERR_INVALID_DN_SYNTAX")
except ldb.LdbError as err:
enum = err.args[0]
diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
index 0c4ee7abf27..b916f9c97b8 100644
--- a/python/samba/netcmd/fsmo.py
+++ b/python/samba/netcmd/fsmo.py
@@ -120,8 +120,8 @@ def transfer_dns_role(outf, sambaopts, credopts, role, samdb):
m = ldb.Message()
m.dn = ldb.Dn(samdb, role_object)
m["fSMORoleOwner"] = ldb.MessageElement(new_owner,
- ldb.FLAG_MOD_ADD,
- "fSMORoleOwner")
+ ldb.FLAG_MOD_ADD,
+ "fSMORoleOwner")
try:
samdb.modify(m)
except LdbError as e5:
diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index e4ea7ba3697..6a7efe8add8 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -1385,7 +1385,7 @@ class cmd_restore(cmd_create):
dtd_header += '\n]>\n'
super(cmd_restore, self).run(displayname, H, tmpdir, sambaopts,
- credopts, versionopts)
+ credopts, versionopts)
try:
# Iterate over backup files and restore with DTD
diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py
index 73aad386450..7938a077d18 100644
--- a/python/samba/tests/samba_tool/gpo.py
+++ b/python/samba/tests/samba_tool/gpo.py
@@ -147,9 +147,9 @@ class GpoCmdTestCase(SambaToolCmdTest):
# Compare the directories
self.assertIsNone(has_difference(os.path.join(new_path, 'policy',
- gpo_guid),
- static_path, binary=True,
- xml=False))
+ gpo_guid),
+ static_path, binary=True,
+ xml=False))
finally:
if gpo_guid:
(result, out, err) = self.runsubcmd("gpo", "del", gpo_guid,
@@ -222,10 +222,10 @@ class GpoCmdTestCase(SambaToolCmdTest):
# Compare the directories
self.assertIsNone(has_difference(os.path.join(new_path, 'policy',
- gpo_guid1),
- os.path.join(new_path, 'policy',
- gpo_guid2),
- binary=True, xml=False))
+ gpo_guid1),
+ os.path.join(new_path, 'policy',
+ gpo_guid2),
+ binary=True, xml=False))
finally:
if gpo_guid1:
(result, out, err) = self.runsubcmd("gpo", "del", gpo_guid1,
@@ -303,10 +303,10 @@ class GpoCmdTestCase(SambaToolCmdTest):
# Compare the directories
self.assertIsNone(has_difference(os.path.join(new_path, 'policy',
- gpo_guid1),
- os.path.join(new_path, 'policy',
- gpo_guid2),
- binary=True, xml=True))
+ gpo_guid1),
+ os.path.join(new_path, 'policy',
+ gpo_guid2),
+ binary=True, xml=True))
finally:
if gpo_guid1:
(result, out, err) = self.runsubcmd("gpo", "del", gpo_guid1,
@@ -391,9 +391,9 @@ class GpoCmdTestCase(SambaToolCmdTest):
# Compare the directories (XML)
self.assertIsNone(has_difference(os.path.join(new_path, 'policy',
- gpo_guid),
- static_path, binary=False,
- xml=True))
+ gpo_guid),
+ static_path, binary=False,
+ xml=True))
finally:
if gpo_guid:
(result, out, err) = self.runsubcmd("gpo", "del", gpo_guid,
diff --git a/source3/script/tests/test_smbcquota.py b/source3/script/tests/test_smbcquota.py
index 1e8f06386b8..0136cc97ce6 100755
--- a/source3/script/tests/test_smbcquota.py
+++ b/source3/script/tests/test_smbcquota.py
@@ -102,7 +102,7 @@ def get_quotas(uid, quota_list):
def get_users():
output = subprocess.Popen(['getent', 'passwd'],
- stdout=subprocess.PIPE).communicate()[0].decode("utf-8").split('\n')
+ stdout=subprocess.PIPE).communicate()[0].decode("utf-8").split('\n')
users = []
for line in output:
info = line.split(':')
@@ -222,7 +222,7 @@ def main():
env.envdir = sys.argv[5]
env.smbcquotas = sys.argv[6]
quota_script = os.path.join(os.path.dirname(sys.argv[0]),
- "getset_quota.py")
+ "getset_quota.py")
#copy the quota script to the evironment
shutil.copy2(quota_script, env.envdir)
diff --git a/source4/dsdb/tests/python/confidential_attr.py b/source4/dsdb/tests/python/confidential_attr.py
index 478aec67761..3f82a359553 100755
--- a/source4/dsdb/tests/python/confidential_attr.py
+++ b/source4/dsdb/tests/python/confidential_attr.py
@@ -628,7 +628,7 @@ class ConfidentialAttrTestDenyAcl(ConfidentialAttrCommon):
res = samdb.search(self.test_dn, expression=expr,
scope=SCOPE_SUBTREE, attrs=attr)
self.assertTrue(len(res) == expected_num,
- "%u results, not %u for search %s, attr %s" %
+ "%u results, not %u for search %s, attr %s" %
(len(res), expected_num, expr, str(attr)))
# assert we haven't revealed the hidden test-object
diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 4860995c8d3..2b18853780d 100644
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -254,7 +254,7 @@ class DrsBaseTestCase(SambaToolCmdTest):
next_object = ctr6.first_object
for i in range(0, ctr6.object_count):
print("Obj %d: %s %s" % (i, next_object.object.identifier.dn[:25],
- next_object.object.identifier.guid))
+ next_object.object.identifier.guid))
next_object = next_object.next_object
print("Linked Attributes: %d" % ctr6.linked_attributes_count)
@@ -273,7 +273,7 @@ class DrsBaseTestCase(SambaToolCmdTest):
if l.flags & drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE:
state = "Act"
print(" v%u %s changed %u" % (l.meta_data.version, state,
- l.meta_data.originating_change_time))
+ l.meta_data.originating_change_time))
print("HWM: %d" % (ctr6.new_highwatermark.highest_usn))
print("Tmp HWM: %d" % (ctr6.new_highwatermark.tmp_highest_usn))
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index b42c84d829b..ac550b2e4d0 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -32,20 +32,20 @@ def provision_s4(t, func_level="2008"):
t.del_files(["var", "private"])
t.run_cmd("rm -f etc/smb.conf")
provision = ['bin/samba-tool',
- 'domain',
- 'provision',
- '--realm=${LCREALM}',
- '--domain=${DOMAIN}',
- '--adminpass=${PASSWORD1}',
- '--server-role=domain controller',
- '--function-level=%s' % func_level,
- '-d${DEBUGLEVEL}',
- '--option=interfaces=${INTERFACE}',
- '--host-ip=${INTERFACE_IP}',
- '--option=bind interfaces only=yes',
- '--option=rndc command=${RNDC} -c${PREFIX}/etc/rndc.conf',
- '--dns-backend=${NAMESERVER_BACKEND}',
- '${DNS_FORWARDER}']
+ 'domain',
+ 'provision',
+ '--realm=${LCREALM}',
+ '--domain=${DOMAIN}',
+ '--adminpass=${PASSWORD1}',
+ '--server-role=domain controller',
+ '--function-level=%s' % func_level,
+ '-d${DEBUGLEVEL}',
+ '--option=interfaces=${INTERFACE}',
+ '--host-ip=${INTERFACE_IP}',
+ '--option=bind interfaces only=yes',
+ '--option=rndc command=${RNDC} -c${PREFIX}/etc/rndc.conf',
+ '--dns-backend=${NAMESERVER_BACKEND}',
+ '${DNS_FORWARDER}']
if t.getvar('USE_NTVFS'):
provision.append('${USE_NTVFS}')
View Lorry Controller Status