From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: tests.cfg.sample: add params to qemu command line properly Date: Fri, 10 Sep 2010 12:57:32 -0300 Message-ID: <1284134252-16976-1-git-send-email-lmr@redhat.com> Cc: kvm@vger.kernel.org, kwolf@redhat.com, lcapitulino@redhat.com, Lucas Meneghel Rodrigues To: autotest@test.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33060 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754279Ab0IJP5h (ORCPT ); Fri, 10 Sep 2010 11:57:37 -0400 Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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