diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-11-27 11:33:52 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-11-27 02:42:19 +0100 |
commit | 8737baee7c8666b268bff88070ac93164d41470f (patch) | |
tree | b802c304bcfd35e588918e627fa42a3f7ee6e976 /wintest/wintest.py | |
parent | 353cdd006a467375809eb3c21dc44df7efb9c1d9 (diff) | |
download | samba-8737baee7c8666b268bff88070ac93164d41470f.tar.gz samba-8737baee7c8666b268bff88070ac93164d41470f.tar.bz2 samba-8737baee7c8666b268bff88070ac93164d41470f.zip |
wintest: cope with VMs sometimes not rebooting
my w2k8 image occasionally gets stuck in the early stages of
booting. This adds code to detect a failed reboot, in which case the
VM is reset
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Sat Nov 27 02:42:19 CET 2010 on sn-devel-104
Diffstat (limited to 'wintest/wintest.py')
-rw-r--r-- | wintest/wintest.py | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py index 1c5b087aa1..effc77e95e 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -200,7 +200,8 @@ class wintest(): return except: time.sleep(delay) - retries = retries - 1 + retries -= 1 + self.info("retrying (retries=%u delay=%u)" % (retries, delay)) raise RuntimeError("Failed to find %s" % contains) def pexpect_spawn(self, cmd, timeout=60, crlf=True): @@ -240,6 +241,11 @@ class wintest(): self.setvar('VMNAME', vmname) self.run_cmd("${VM_POWEROFF}", checkfail=checkfail) + def vm_reset(self, vmname): + '''reset a VM''' + self.setvar('VMNAME', vmname) + self.run_cmd("${VM_RESET}") + def vm_restore(self, vmname, snapshot): '''restore a VM''' self.setvar('VMNAME', vmname) @@ -368,6 +374,7 @@ class wintest(): return child.after retries -= 1 time.sleep(delay) + self.info("retrying (retries=%u delay=%u)" % (retries, delay)) raise RuntimeError("Failed to resolve IP of %s" % hostname) @@ -394,6 +401,7 @@ class wintest(): child.close() time.sleep(delay) retries -= 1 + self.info("retrying (retries=%u delay=%u)" % (retries, delay)) continue child.expect("password:") child.sendline(password) @@ -408,6 +416,7 @@ class wintest(): child.close() time.sleep(delay) retries -= 1 + self.info("retrying (retries=%u delay=%u)" % (retries, delay)) continue if set_dns: set_dns = False @@ -459,3 +468,21 @@ class wintest(): if base + '_IP' in self.vars: ret[self.vars[base + '_REALM']] = self.vars[base + '_IP'] return ret + + def wait_reboot(self, retries=3): + '''wait for a VM to reboot''' + + # first wait for it to shutdown + self.port_wait("${WIN_IP}", 139, wait_for_fail=True, delay=6) + + # now wait for it to come back. If it fails to come back + # then try resetting it + while retries > 0: + try: + self.port_wait("${WIN_IP}", 139) + return + except: + retries -= 1 + self.vm_reset("${WIN_VM}") + self.info("retrying reboot (retries=%u)" % retries) + raise RuntimeError(self.substitute("VM ${WIN_VM} failed to reboot")) |