diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-27 10:27:22 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-27 01:03:30 +0100 |
| commit | 3bc6145143da320979c867b155bacaf8125adf3a (patch) | |
| tree | 090760d77e7d013971bfd7f7b6e710f2347f1c11 /wintest | |
| parent | 1e96da556acc021ed296551f137d5600e2c1a58c (diff) | |
| download | samba-3bc6145143da320979c867b155bacaf8125adf3a.tar.gz samba-3bc6145143da320979c867b155bacaf8125adf3a.tar.bz2 samba-3bc6145143da320979c867b155bacaf8125adf3a.zip | |
wintest: handle missing firewall commands
my w2k3 box doesn't have these firewall commands
Diffstat (limited to 'wintest')
| -rw-r--r-- | wintest/wintest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py index 36d0659f03..1c5b087aa1 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): |