On Mon, Dec 21, 2009 at 11:13:14AM -0500, Joey Boggs wrote: > On 12/15/2009 09:47 AM, Darryl L. Pierce wrote: > >By default it's 120 ms, but can be changed through command line > >arguments. > > > >Signed-off-by: Darryl L. Pierce<[email protected]> > >--- > > autotest.sh | 16 ++++++++++------ > > 1 files changed, 10 insertions(+), 6 deletions(-) > > > >diff --git a/autotest.sh b/autotest.sh > >index c67931a..bcd9bd5 100755 > >--- a/autotest.sh > >+++ b/autotest.sh > >@@ -62,6 +62,7 @@ Usage: $ME [-n test_name] [LOGFILE] > > -i: set the ISO filename (defualt: ovirt-node-image.iso) > > -n: the name of the specific autotest to run (default: run all autotests) > > -d: enable more verbose output (default: disabled) > >+ -t: change the timeout between markers (in ms, default: 120) > > -v: enable tracing (default: disabled) > > -w: launch virt-viewer for each VM (default: no window shown) > > -h: display this help and exit > >@@ -484,7 +485,7 @@ test_stateless_pxe () { > > boot_with_pxe "${nodename}" "standalone firstboot=no" "${workdir}" > > > > expect -c ' > >-set timeout 120 > >+set timeout '${timeout_period}' > > > > log_file -noappend stateless-pxe.log > > > >@@ -526,7 +527,7 @@ test_stateless_pxe_with_nohd () { > > boot_with_pxe "${nodename}" "firstboot=no" "${workdir}" > > > > expect -c ' > >-set timeout 120 > >+set timeout '${timeout_period}' > > > > log_file -noappend stateless-pxe.log > > > >@@ -575,7 +576,7 @@ test_stateful_pxe () { > > > > # verify the booting and installation > > expect -c ' > >-set timeout 120 > >+set timeout '${timeout_period}' > > log_file -noappend stateful-pxe.log > > > > spawn sudo virsh console '"${nodename}"' > >@@ -608,7 +609,7 @@ exit 3' > > boot_from_hd "${nodename}" > > > > expect -c ' > >-set timeout 120 > >+set timeout '${timeout_period}' > > log_file stateful-pxe.log > > > > send_log "Restarted node, booting from hard disk.\n" > >@@ -704,13 +705,15 @@ isofile="${PWD}/ovirt-node-image.iso" > > show_viewer=false > > vm_prefix="$$" > > preserve_vm=false > >+timeout_period="120" > > > >-while getopts di:n:pvwh c; do > >+while getopts di:n:pt:vwh c; do > > case $c in > > d) debugging=true;; > > i) isofile=($OPTARG);; > > n) tests=($OPTARG);; > >- p) preserve_vm=true;; > >+ p) preserve_vm=true;; > >+ t) timeout_period=($OPTARG);; > > v) set -v;; > > w) show_viewer=true;; > > h) usage; exit 0;; > >@@ -738,6 +741,7 @@ log "Logging results to file: ${RESULTS}" > > > > log "Begin Testing: ${isoname}" > > log "Tests: ${tests}" > >+ log "Timeout: ${timeout_period} ms" > > > > for test in ${tests}; do > > execute_test $test > ACK
Thanks. This is now pushed upstream. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/
pgp4LKIov7v4v.pgp
Description: PGP signature
_______________________________________________ Ovirt-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/ovirt-devel
