summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:22:52 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:31 +0200
commitaa243d1a7f64c474265b7f735601139ab9ff7b92 (patch)
tree15917c781ac1399653fb71161182e558e5f2abff /wintest
parent9f5bbcc10a82f409f41cce5685458332674e2010 (diff)
downloadsamba-aa243d1a7f64c474265b7f735601139ab9ff7b92.tar.gz
PEP8: fix W291: trailing whitespace
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 'wintest')
-rwxr-xr-xwintest/test-s3.py2
-rw-r--r--wintest/wintest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 71f5f775674..6e3cb9521d6 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -14,7 +14,7 @@ def set_libpath(t):
def set_krb5_conf(t):
t.run_cmd("mkdir -p ${PREFIX}/etc")
- t.write_file("${PREFIX}/etc/krb5.conf",
+ t.write_file("${PREFIX}/etc/krb5.conf",
'''[libdefaults]
dns_lookup_realm = false
dns_lookup_kdc = true''')
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 166489aa037..4152069bbdf 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -894,7 +894,7 @@ RebootOnCompletion=No
child.sendline("ipconfig /flushdns")
child.expect("C:")
child.sendline("netdom join ${WIN_HOSTNAME} /Domain:%s /UserD:%s /PasswordD:%s" % (domain, username, password))
- i = child.expect(["The command completed successfully",
+ i = child.expect(["The command completed successfully",
"The specified domain either does not exist or could not be contacted."], timeout=120)
if i == 0:
break