Sometime check_cmd could not finish in setting time.
Then o="", so int(o) will cause ValueError:
invalid literal for int() with base 10: ''
So change to check return status.
Signed-off-by: Feng Yang <fyang@xxxxxxxxxx>
---
client/tests/kvm/tests/ioquit.py | 6 +++---
client/tests/kvm/tests_base.cfg.sample | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/tests/kvm/tests/ioquit.py b/client/tests/kvm/tests/ioquit.py
index 389a867..8126139 100644
--- a/client/tests/kvm/tests/ioquit.py
+++ b/client/tests/kvm/tests/ioquit.py
@@ -23,13 +23,13 @@ def run_ioquit(test, params, env):
(s, o) = session.get_command_status_output(bg_cmd, timeout=60)
check_cmd = params.get("check_cmd")
(s, o) = session2.get_command_status_output(check_cmd, timeout=60)
- if int(o) <= 0:
+ if s:
raise error.TestError("Fail to add IO workload for Guest OS")
logging.info("Sleep for a while")
time.sleep(random.randrange(30,100))
- (s, o) = session2.get_command_status_output(check_cmd, timeout=300)
- if int(o) <= 0:
+ (s, o) = session2.get_command_status_output(check_cmd, timeout=60)
+ if s:
logging.info("IO workload finished before the VM was killed")
logging.info("Kill the virtual machine")
vm.process.close()
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index ce88235..0fd5543 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -411,7 +411,7 @@ variants:
- ioquit:
type = ioquit
background_cmd = "for i in 1 2 3 4; do (nohup dd if=/dev/urandom of=/tmp/file bs=102400 count=10000000 &) done"
- check_cmd = ps -a |grep dd |wc -l
+ check_cmd = ps -a |grep dd
login_timeout = 360
- qemu_img:
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
