sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

PEP8: fix E502: the backslash is redundant between brackets

Browse Source 
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>
This commit is contained in:
Joe Guo
2018-07-30 18:22:01 +12:00
committed by Douglas Bagnall
parent 95c36d825c
commit 7b031b01a1
18 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
python/samba/tests/samba_tool/dnscmd.py
View File

@ -185,10 +185,10 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.creds_string)
try:
self.assertCmdSuccess(result, out, err,
"Failed to query for a record" \
"Failed to query for a record"
"which had DNS_RANK_NONE.")
self.assertTrue("testrecord" in out and record_str in out,
"Query for a record which had DNS_RANK_NONE" \
"Query for a record which had DNS_RANK_NONE"
"succeeded but produced no resulting records.")
except AssertionError as e:
# Windows produces no resulting records
@ -199,7 +199,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord", record_type_str,
record_str, self.creds_string)
try:
self.assertCmdFail(result, "Successfully added duplicate record" \
self.assertCmdFail(result, "Successfully added duplicate record"
"of one which had DNS_RANK_NONE.")
except AssertionError as e:
errors.append(e)
@ -209,7 +209,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord", record_type_str,
record_str, self.creds_string)
try:
self.assertCmdSuccess(result, out, err, "Failed to delete record" \
self.assertCmdSuccess(result, out, err, "Failed to delete record"
"which had DNS_RANK_NONE.")
except AssertionError as e:
errors.append(e)
@ -219,7 +219,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
record_type_str, self.creds_string)
try:
self.assertCmdFail(result, "Successfully queried for deleted record" \
self.assertCmdFail(result, "Successfully queried for deleted record"
"which had DNS_RANK_NONE.")
except AssertionError as e:
errors.append(e)
@ -244,7 +244,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add" \
self.assertCmdSuccess(result, out, err, "Failed to add"
"record %s with type %s."
% (record, dnstype))
@ -253,7 +253,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to query" \
self.assertCmdSuccess(result, out, err, "Failed to query"
"record %s with qualifier %s."
% (record, dnstype))
@ -262,7 +262,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to remove" \
self.assertCmdSuccess(result, out, err, "Failed to remove"
"record %s with type %s."
% (record, dnstype))
except AssertionError as e:
@ -272,7 +272,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
if num_failures > 0:
for msg in failure_msgs:
print(msg)
self.fail("Failed to accept valid commands. %d total failures." \
self.fail("Failed to accept valid commands. %d total failures."
"Errors above." % num_failures)
def test_reject_invalid_commands(self):
@ -292,7 +292,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdFail(result, "Successfully added invalid" \
self.assertCmdFail(result, "Successfully added invalid"
"record '%s' of type '%s'."
% (record, dnstype))
except AssertionError as e:
@ -305,8 +305,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdFail(result, "Successfully deleted invalid" \
"record '%s' of type '%s' which" \
self.assertCmdFail(result, "Successfully deleted invalid"
"record '%s' of type '%s' which"
"shouldn't exist." % (record, dnstype))
except AssertionError as e:
num_failures = num_failures + 1
@ -325,7 +325,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, good_record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add " \
self.assertCmdSuccess(result, out, err, "Failed to add "
"record '%s' with type %s."
% (record, dnstype))
@ -335,8 +335,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
dnstype, good_record,
bad_record,
self.creds_string)
self.assertCmdFail(result, "Successfully updated valid " \
"record '%s' of type '%s' to invalid " \
self.assertCmdFail(result, "Successfully updated valid "
"record '%s' of type '%s' to invalid "
"record '%s' of the same type."
% (good_record, dnstype, bad_record))
@ -345,7 +345,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, good_record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Could not delete " \
self.assertCmdSuccess(result, out, err, "Could not delete "
"valid record '%s' of type '%s'."
% (good_record, dnstype))
except AssertionError as e:
@ -356,7 +356,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
if num_failures > 0:
for msg in failure_msgs:
print(msg)
self.fail("Failed to reject invalid commands. %d total failures. " \
self.fail("Failed to reject invalid commands. %d total failures. "
"Errors above." % num_failures)
def test_update_invalid_type(self):
@ -370,7 +370,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype1, record1,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add " \
self.assertCmdSuccess(result, out, err, "Failed to add "
"record %s with type %s."
% (record1, dnstype1))
@ -396,8 +396,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype1, record1,
record2, self.creds_string)
self.assertCmdFail(result, "Successfully updated record '%s' " \
"to '%s', even though the latter is of " \
self.assertCmdFail(result, "Successfully updated record '%s' "
"to '%s', even though the latter is of "
"type '%s' where '%s' was expected."
% (record1, record2, dnstype2, dnstype1))
@ -406,8 +406,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype2, record1, record2,
self.creds_string)
self.assertCmdFail(result, "Successfully updated record " \
"'%s' to '%s', even though the former " \
self.assertCmdFail(result, "Successfully updated record "
"'%s' to '%s', even though the former "
"is of type '%s' where '%s' was expected."
% (record1, record2, dnstype1, dnstype2))
@ -419,7 +419,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add " \
self.assertCmdSuccess(result, out, err, "Failed to add "
"record %s with type %s."
% (record, dnstype))
@ -429,7 +429,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record, record,
self.creds_string)
self.assertCmdFail(result, "Successfully updated record " \
self.assertCmdFail(result, "Successfully updated record "
"'%s' to be exactly the same." % record)
result, out, err = self.runsubcmd("dns", "delete",
@ -437,7 +437,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Could not delete " \
self.assertCmdSuccess(result, out, err, "Could not delete "
"valid record '%s' of type '%s'."
% (record, dnstype))
@ -447,7 +447,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
"SRV", record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add " \
self.assertCmdSuccess(result, out, err, "Failed to add "
"record %s with type 'SRV'." % record)
split = record.split(' ')
@ -459,7 +459,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
"SRV", record,
new_record, self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to update record " \
self.assertCmdSuccess(result, out, err, "Failed to update record "
"'%s' of type '%s' to '%s'."
% (record, "SRV", new_record))
@ -467,7 +467,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
os.environ["SERVER"],
self.zone, "testrecord",
"SRV", self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to query for " \
self.assertCmdSuccess(result, out, err, "Failed to query for "
"record '%s' of type '%s'."
% (new_record, "SRV"))
@ -476,7 +476,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
"SRV", new_record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Could not delete " \
self.assertCmdSuccess(result, out, err, "Could not delete "
"valid record '%s' of type '%s'."
% (new_record, "SRV"))
@ -495,7 +495,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype, used_record,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add record %s " \
self.assertCmdSuccess(result, out, err, "Failed to add record %s "
"with type %s." % (used_record, dnstype))
result, out, err = self.runsubcmd("dns", "update",
@ -504,8 +504,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
dnstype, unused_record,
new_record,
self.creds_string)
self.assertCmdFail(result, "Successfully updated record '%s' " \
"from '%s' to '%s', even though the given " \
self.assertCmdFail(result, "Successfully updated record '%s' "
"from '%s' to '%s', even though the given "
"source record is incorrect."
% (used_record, unused_record, new_record))
@ -515,10 +515,10 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
"SOA", "test",
self.creds_string)
self.assertCmdFail(result, "Successfully added record of type SOA, " \
self.assertCmdFail(result, "Successfully added record of type SOA, "
"when this type should not be available.")
self.assertTrue("type SOA is not supported" in err,
"Invalid error message '%s' when attempting to " \
"Invalid error message '%s' when attempting to "
"add record of type SOA." % err)
def test_add_overlapping_different_type(self):
@ -545,7 +545,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype1, record1,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add record " \
self.assertCmdSuccess(result, out, err, "Failed to add record "
"'%s' of type '%s'." % (record1, dnstype1))
result, out, err = self.runsubcmd("dns", "add",
@ -553,8 +553,8 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype2, record2,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to add record " \
"'%s' of type '%s' when a record '%s' " \
self.assertCmdSuccess(result, out, err, "Failed to add record "
"'%s' of type '%s' when a record '%s' "
"of type '%s' with the same name exists."
% (record1, dnstype1, record2, dnstype2))
@ -562,9 +562,9 @@ class DnsCmdTestCase(SambaToolCmdTest):
os.environ["SERVER"],
self.zone, "testrecord",
dnstype1, self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to query for " \
"record '%s' of type '%s' when a new " \
"record '%s' of type '%s' with the same " \
self.assertCmdSuccess(result, out, err, "Failed to query for "
"record '%s' of type '%s' when a new "
"record '%s' of type '%s' with the same "
"name was added."
% (record1, dnstype1, record2, dnstype2))
@ -572,9 +572,9 @@ class DnsCmdTestCase(SambaToolCmdTest):
os.environ["SERVER"],
self.zone, "testrecord",
dnstype2, self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to query " \
"record '%s' of type '%s' which should " \
"have been added with the same name as " \
self.assertCmdSuccess(result, out, err, "Failed to query "
"record '%s' of type '%s' which should "
"have been added with the same name as "
"record '%s' of type '%s'."
% (record2, dnstype2, record1, dnstype1))
@ -583,7 +583,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype1, record1,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to delete " \
self.assertCmdSuccess(result, out, err, "Failed to delete "
"record '%s' of type '%s'."
% (record1, dnstype1))
@ -592,7 +592,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
self.zone, "testrecord",
dnstype2, record2,
self.creds_string)
self.assertCmdSuccess(result, out, err, "Failed to delete " \
self.assertCmdSuccess(result, out, err, "Failed to delete "
"record '%s' of type '%s'."
% (record2, dnstype2))