summaryrefslogtreecommitdiff
path: root/wintest/conf
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-27 11:33:52 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-27 02:42:19 +0100
commit8737baee7c8666b268bff88070ac93164d41470f (patch)
treeb802c304bcfd35e588918e627fa42a3f7ee6e976 /wintest/conf
parent353cdd006a467375809eb3c21dc44df7efb9c1d9 (diff)
downloadsamba-8737baee7c8666b268bff88070ac93164d41470f.tar.gz
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/conf')
-rw-r--r--wintest/conf/abartlet.conf1
-rw-r--r--wintest/conf/tridge.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index f775c81b3af..00578f437d0 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -12,6 +12,7 @@ DEBUGLEVEL : 1
# commands to control VMs
VM_POWEROFF : virsh destroy ${VMNAME}
VM_RESTORE : virsh snapshot-revert ${VMNAME} ${SNAPSHOT}
+VM_RESET : virsh reboot ${VMNAME}
# interfaces to create
INTERFACE : virbr0:0
diff --git a/wintest/conf/tridge.conf b/wintest/conf/tridge.conf
index 1c7ed0bda74..72b54d88da0 100644
--- a/wintest/conf/tridge.conf
+++ b/wintest/conf/tridge.conf
@@ -12,6 +12,7 @@ DEBUGLEVEL : 1
# commands to control VMs
VM_POWEROFF : su tridge -c "VBoxManage controlvm ${VMNAME} poweroff"
VM_RESTORE : su tridge -c "VBoxManage snapshot ${VMNAME} restore ${SNAPSHOT} && VBoxManage startvm ${VMNAME}"
+VM_RESET : su tridge -c "VBoxManage controlvm ${VMNAME} reset"
# interfaces to listen on
INTERFACE : virbr0:0