[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Fri Nov 26 17:48:04 MST 2010


The branch, master has been updated
       via  353cdd0 wintest: avoid adding a blank line to resolv.conf on each run
       via  3bc6145 wintest: handle missing firewall commands
      from  1e96da5 s3-param Fix lp_set_cmdline() to set the flag on alias values too

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 353cdd006a467375809eb3c21dc44df7efb9c1d9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sat Nov 27 10:28:15 2010 +1100

    wintest: avoid adding a blank line to resolv.conf on each run
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Sat Nov 27 01:47:48 CET 2010 on sn-devel-104

commit 3bc6145143da320979c867b155bacaf8125adf3a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sat Nov 27 10:27:22 2010 +1100

    wintest: handle missing firewall commands
    
    my w2k3 box doesn't have these firewall commands

-----------------------------------------------------------------------

Summary of changes:
 wintest/test-s4-howto.py |    3 +--
 wintest/wintest.py       |    4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index c05d084..3d4b5e0 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -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")
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 36d0659..1c5b087 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -319,7 +319,9 @@ class wintest():
         child.expect("C:")
         if i == 1:
             child.sendline('netsh firewall set opmode mode = DISABLE profile = ALL')
-            child.expect("Ok")
+            i = child.expect(["Ok", "The following command was not found"])
+            if i != 0:
+                self.info("Firewall disable failed - ignoring")
             child.expect("C:")
  
     def set_dns(self, child):


-- 
Samba Shared Repository


More information about the samba-cvs mailing list