diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-03-17 14:49:14 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-07-02 04:21:36 +0000 |
| commit | 6972b53f505a97985cb9127c181a5a7cfa987368 (patch) | |
| tree | 03d68651c818d6c01760c9c731e77a353da57b41 /wintest | |
| parent | 5331f913ac4dd3d94bed45846b64b89475029994 (diff) | |
| download | samba-6972b53f505a97985cb9127c181a5a7cfa987368.tar.gz | |
wintest: py3 telnet.sendline() doesn't like string with ^Z
Try using bytes instead.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'wintest')
| -rwxr-xr-x | wintest/test-s4-howto.py | 4 | ||||
| -rw-r--r-- | wintest/wintest.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index 5102387124a..2c8758dd6e2 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -160,7 +160,7 @@ def run_dcpromo(t, vm): t.info("Joining a windows VM ${WIN_VM} to the domain as a DC using dcpromo") child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_ip=True, set_noexpire=True) child.sendline("copy /Y con answers.txt") - child.sendline(''' + child.sendline(b''' [DCINSTALL] RebootOnSuccess=Yes RebootOnCompletion=Yes @@ -315,7 +315,7 @@ def run_dcpromo_rodc(t, vm): t.vm_restore("${WIN_VM}", "${WIN_SNAPSHOT}") child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_ip=True) child.sendline("copy /Y con answers.txt") - child.sendline(''' + child.sendline(b''' [DCInstall] ReplicaOrNewDomain=ReadOnlyReplica ReplicaDomainDNSName=${LCREALM} diff --git a/wintest/wintest.py b/wintest/wintest.py index c239bab5506..914b5d61689 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -834,7 +834,7 @@ options { """This server must therefore not yet be a directory server, so we must promote it""" child.sendline("copy /Y con answers.txt") - child.sendline(''' + child.sendline(b''' [DCInstall] ; New forest promotion ReplicaOrNewDomain=Domain |