sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

wintest: avoid adding a blank line to resolv.conf on each run

Browse Source 
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Sat Nov 27 01:47:48 CET 2010 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2010-11-27 10:28:15 +11:00
parent 3bc6145143
commit 353cdd006a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wintest/test-s4-howto.py
View File

@ -105,13 +105,12 @@ def set_nameserver(t, nameserver):
nameserver %s
# your original resolv.conf appears below:
''' % t.substitute(nameserver))
child = t.pexpect_spawn("cat /etc/resolv.conf", crlf=False)
i = child.expect(['your original resolv.conf appears below:', pexpect.EOF])
if i == 0:
child.expect(pexpect.EOF)
contents = child.before.replace('\r', '')
contents = child.before.lstrip().replace('\r', '')
t.write_file('/etc/resolv.conf.wintest', contents, mode='a')
t.write_file('/etc/resolv.conf.wintest-bak', contents)
t.run_cmd("mv -f /etc/resolv.conf.wintest /etc/resolv.conf")