From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 26 Nov 2010 23:27:22 +0000 (+1100)
Subject: wintest: handle missing firewall commands
X-Git-Tag: samba-4.0.0alpha14~773
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=3bc6145143da320979c867b155bacaf8125adf3a

wintest: handle missing firewall commands

my w2k3 box doesn't have these firewall commands
---

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 36d0659f031..1c5b087aa12 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):