summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-16 14:01:44 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-16 15:20:09 +1100
commit15a0de66cb750f935f2b908763d2369e23366d6c (patch)
tree5c0fd9f0ff62d6de5143623d4f3cd500db9963ac
parent2ba57f42b8d31d994d565d0c6daf339dddb61069 (diff)
downloadsamba-15a0de66cb750f935f2b908763d2369e23366d6c.tar.gz
samba-15a0de66cb750f935f2b908763d2369e23366d6c.tar.bz2
samba-15a0de66cb750f935f2b908763d2369e23366d6c.zip
wintest: Allow access denied when turning off the firewall
-rw-r--r--wintest/wintest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 8bdd7a85eb..b58cff597d 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -577,11 +577,11 @@ options {
def disable_firewall(self, child):
'''remove the annoying firewall'''
child.sendline('netsh advfirewall set allprofiles state off')
- i = child.expect(["Ok", "The following command was not found: advfirewall set allprofiles state off", "The requested operation requires elevation"])
+ i = child.expect(["Ok", "The following command was not found: advfirewall set allprofiles state off", "The requested operation requires elevation", "Access is denied"])
child.expect("C:")
if i == 1:
child.sendline('netsh firewall set opmode mode = DISABLE profile = ALL')
- i = child.expect(["Ok", "The following command was not found"])
+ i = child.expect(["Ok", "The following command was not found", "Access is denied"])
if i != 0:
self.info("Firewall disable failed - ignoring")
child.expect("C:")