summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-17 11:26:23 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-17 17:36:37 +1100
commit111f8f4a7c86951c49dbc0f4c030d3a83d82b060 (patch)
tree3dd11809a365092376395eef63a30d131d6dd53e
parented85e9fe6a10d3c34b74788e6f862ea23dce4f2b (diff)
downloadsamba-111f8f4a7c86951c49dbc0f4c030d3a83d82b060.tar.gz
samba-111f8f4a7c86951c49dbc0f4c030d3a83d82b060.tar.xz
samba-111f8f4a7c86951c49dbc0f4c030d3a83d82b060.zip
wintest: Allow Windows VM to have no default route
-rw-r--r--wintest/wintest.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py
index da65732219c..2738044e102 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -545,9 +545,10 @@ options {
child.expect('\d+.\d+.\d+.\d+')
self.setvar('WIN_SUBNET_MASK', child.after)
child.expect('Default Gateway')
- child.expect('\d+.\d+.\d+.\d+')
- self.setvar('WIN_DEFAULT_GATEWAY', child.after)
- child.expect("C:")
+ i = child.expect(['\d+.\d+.\d+.\d+', "C:"])
+ if i == 0:
+ self.setvar('WIN_DEFAULT_GATEWAY', child.after)
+ child.expect("C:")
def get_is_dc(self, child):
'''check if a windows machine is a domain controller'''