summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:14:21 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:26 +0200
commit297faf325225e06f9658457513044631d62e3dbe (patch)
tree9eecfd7f023b8752f9aa33e4fd2bc1d9bb15cb15 /source4
parentb43408b383d06d7c0c87b8f6e9549544fc057bc2 (diff)
downloadsamba-297faf325225e06f9658457513044631d62e3dbe.tar.gz
PEP8: fix E122: continuation line missing indentation or outdented
Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/tests/python/ndr_pack_performance.py4
-rwxr-xr-xsource4/dsdb/tests/python/sam.py2
-rwxr-xr-xsource4/selftest/tests.py18
-rw-r--r--source4/torture/drs/python/getnc_exop.py8
4 files changed, 16 insertions, 16 deletions
diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index 9ce0d4c32bf..c5a42c60f61 100644
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -65,7 +65,7 @@ random.seed(1)
BIG_SD_SDDL = ''.join(
-"""O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
+ """O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
1-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O
@@ -118,7 +118,7 @@ f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)
80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)""".split())
LITTLE_SD_SDDL = ''.join(
-"""O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
+ """O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
1-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O
diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 91a79483367..e2d7b40ebae 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -1797,7 +1797,7 @@ class SamTests(samba.tests.TestCase):
def assertLDAPErrorMsg(msg, expected_msg):
self.assertTrue(expected_msg in msg,
"msg[%s] does not contain expected[%s]" % (
- msg, expected_msg))
+ msg, expected_msg))
try:
ldb_fail = SamDB(url=host, credentials=sasl_wrong_creds, lp=lp)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index a41149e31ff..9645416e941 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -280,15 +280,15 @@ for bindoptions in ["sign", "seal"]:
for transport in transports:
for bindoptions in ["sign", "seal"]:
for ntlmoptions in [
- "--option=ntlmssp_client:ntlm2=yes --option=torture:quick=yes",
- "--option=ntlmssp_client:ntlm2=no --option=torture:quick=yes",
- "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
- "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
- "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
- "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
- "--option=clientntlmv2auth=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
- "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes --option=torture:quick=yes",
- "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
+ "--option=ntlmssp_client:ntlm2=yes --option=torture:quick=yes",
+ "--option=ntlmssp_client:ntlm2=no --option=torture:quick=yes",
+ "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
+ "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
+ "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+ "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+ "--option=clientntlmv2auth=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+ "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes --option=torture:quick=yes",
+ "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
if transport == "ncalrpc":
env = "ad_dc_ntvfs:local"
else:
diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py
index 366071c3497..db71748c4c8 100644
--- a/source4/torture/drs/python/getnc_exop.py
+++ b/source4/torture/drs/python/getnc_exop.py
@@ -1020,19 +1020,19 @@ class DrsReplicaSyncSortTestCase(drs_base.DrsBaseTestCase):
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid,
u1_guid),
- AbstractLink(drsuapi.DRSUAPI_ATTID_member,
+ AbstractLink(drsuapi.DRSUAPI_ATTID_member,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid,
u2_guid),
- AbstractLink(drsuapi.DRSUAPI_ATTID_member,
+ AbstractLink(drsuapi.DRSUAPI_ATTID_member,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid,
u3_guid),
- AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy,
+ AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid,
u1_guid),
- AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember,
+ AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid,
u2_guid),