KVM test: tests.cfg.sample: add params to qemu command line properly
PATCH 1/1 KVM test: tests.cfg.sample: add params to qemu command line properly
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.
--- client/tests/fsfuzzer/control | 2 +- client/tests/kvm/tests.cfg.sample | 2 +- scheduler/scheduler_models.py | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-)
client/tests/fsfuzzer/control +1 -1
@@ -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')
client/tests/kvm/tests.cfg.sample +1 -1
@@ -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:
scheduler/scheduler_models.py +9 -5
@@ -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
Signature · 1 line
1.7.2.2
Quoted 14 lines · Lucas Meneghel Rodrigues
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.scheduler/scheduler_models.py +0
-4@@ -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)
scheduler/scheduler_models.py class Job(DBObject): · line 931
Quoted 10 lines
scheduler/scheduler_models.py +9
-1- 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"
Appears to be unrelated.
Signature · 2 lines
I have a truly marvellous patch that fixes the bug which this signature is too narrow to contain.
Quoted 4 lines · Lucas Meneghel Rodrigues
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.
Please disregard this one, I'll send the correct version.
Quoted 57 lines
Thanks to Kevin Wolf for having found this problem.
Signed-off-by Lucas Meneghel Rodrigues <[email protected]>--- client/tests/fsfuzzer/control | 2 +- client/tests/kvm/tests.cfg.sample | 2 +- scheduler/scheduler_models.py | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-)client/tests/fsfuzzer/control +1
-1@@ -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')client/tests/kvm/tests.cfg.sample +1
-1@@ -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:scheduler/scheduler_models.py +9
-5@@ -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