From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: autotest@test.kernel.org
Cc: kvm@vger.kernel.org, kwolf@redhat.com, lcapitulino@redhat.com,
Lucas Meneghel Rodrigues <lmr@redhat.com>
Subject: [PATCH] KVM test: tests.cfg.sample: add params to qemu command line properly
Date: Fri, 10 Sep 2010 12:57:32 -0300 [thread overview]
Message-ID: <1284134252-16976-1-git-send-email-lmr@redhat.com> (raw)
There's a small bug on the qemu sample testset for KVM autotest:
We need to append -enable-kvm as extra params to the qemu command
line, not replace all extra params. Small bug, renders the unattended
install unusable for folks trying qemu instead of qemu-kvm.
Thanks to Kevin Wolf for having found this problem.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/fsfuzzer/control | 2 +-
client/tests/kvm/tests.cfg.sample | 2 +-
scheduler/scheduler_models.py | 14 +++++++++-----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/client/tests/fsfuzzer/control b/client/tests/fsfuzzer/control
index 8c8c7e8..55aa036 100644
--- a/client/tests/fsfuzzer/control
+++ b/client/tests/fsfuzzer/control
@@ -18,4 +18,4 @@ WARNING: Currently this test may not work, and it may break subsequent
other test runs.
'''
-job.run_test('fsfuzzer')
+job.run_test('fsfuzzer', fstype='ext4')
diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index 12e1d7a..ce3e307 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -58,7 +58,7 @@ variants:
only Fedora.13.64
only unattended_install.cdrom boot shutdown
# qemu needs -enable-kvm on the cmdline
- extra_params = ' -enable-kvm'
+ extra_params += ' -enable-kvm'
# Runs qemu-kvm, f13 64 bit guest OS, install, boot, shutdown
- @qemu_kvm_f13_quick:
diff --git a/scheduler/scheduler_models.py b/scheduler/scheduler_models.py
index 4df4194..e32e727 100644
--- a/scheduler/scheduler_models.py
+++ b/scheduler/scheduler_models.py
@@ -920,11 +920,15 @@ class Job(DBObject):
WHERE afe_job_id = %s
""" % self.id)
- t_begin, t_end = time_row[0]
- delta = t_end - t_begin
- minutes, seconds = divmod(delta.seconds, 60)
- hours, minutes = divmod(minutes, 60)
- stats['execution_time'] = "%02d:%02d:%02d" % (hours, minutes, seconds)
+ if time_row:
+ t_begin, t_end = time_row[0]
+ delta = t_end - t_begin
+ minutes, seconds = divmod(delta.seconds, 60)
+ hours, minutes = divmod(minutes, 60)
+ stats['execution_time'] = "%02d:%02d:%02d" % (hours, minutes,
+ seconds)
+ else:
+ stats['execution_time'] = "00:00:00"
return stats
--
1.7.2.2
next reply other threads:[~2010-09-10 15:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 15:57 Lucas Meneghel Rodrigues [this message]
2010-09-10 16:04 ` [PATCH] KVM test: tests.cfg.sample: add params to qemu command line properly Avi Kivity
2010-09-10 16:06 ` Lucas Meneghel Rodrigues
-- strict thread matches above, loose matches on Subject: below --
2010-09-10 16:08 Lucas Meneghel Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284134252-16976-1-git-send-email-lmr@redhat.com \
--to=lmr@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox