QA Regression Testing

Merge ~paelzer/qa-regression-testing:fix-virt-cosmic into qa-regression-testing:master

  1. Git
  2. lp:~paelzer/qa-regression-testing
  3. fix-virt-cosmic
  4. Merge into master
Proposed by Christian Ehrhardt 
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: 45c492880261980ff524cd8bba1453109a59896f
Proposed branch: ~paelzer/qa-regression-testing:fix-virt-cosmic
Merge into: qa-regression-testing:master
Diff against target: 48 lines (+4/-4)
3 files modified
scripts/qemu/README.qatest-virtio (+1/-1)
scripts/test-libvirt.py (+2/-2)
scripts/test-qemu.py (+1/-1)
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Review via email: mp+348513@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/qemu/README.qatest-virtio b/scripts/qemu/README.qatest-virtio
2index b8ece6e..0321d9a 100644
3--- a/scripts/qemu/README.qatest-virtio
4+++ b/scripts/qemu/README.qatest-virtio
5@@ -21,7 +21,7 @@ RAM and has a 2048M ide disk with a 1898M root partition (vda1) and a 150M swap
6 nested virtualization, the VM was converted to qemu.
7
8 This can be started with the following:
9-$ qemu -M pc-0.12 -m 128 -name qatest-i386-virtio -rtc base=utc -drive file=./qatest-virtio/qatest-virtio.img,if=none,id=drive-virtio-disk0,boot=on,format=raw -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0
10+$ qemu -M pc-0.12 -m 128 -name qatest-i386-virtio -rtc base=utc -drive file=./qatest-virtio/qatest-virtio.img,if=none,id=drive-virtio-disk0,format=raw -boot c -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0
11
12 For networking, /etc/udev/rules.d/70-persistent-net.rules was edited to remove
13 all entries and /etc/network/interface was edited to bring up eth0 - eth15.
14diff --git a/scripts/test-libvirt.py b/scripts/test-libvirt.py
15index 3c5b96a..568864f 100755
16--- a/scripts/test-libvirt.py
17+++ b/scripts/test-libvirt.py
18@@ -912,7 +912,7 @@ class LibvirtTest(LibvirtTestCommon):
19 # -drive. Ubuntu 9.04 and lower does not have
20 # domxml-from-native
21 qemu_args = os.path.join(self.tmpdir, "qemu.args")
22- contents = '''LC_ALL=C PATH=/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 512 -smp 1 -name foo -boot c -drive file=%s,if=virtio,index=0,boot=on,format=%s -net none serial none -parallel none -usb
23+ contents = '''LC_ALL=C PATH=/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 512 -smp 1 -name foo -boot c -drive file=%s,if=virtio,index=0,format=%s -boot c -net none serial none -parallel none -usb
24 ''' % (disk, t)
25 testlib.create_fill(qemu_args, contents)
26 rc, report = testlib.cmd(['virsh', '-c', self.connect_uri, 'domxml-from-native', 'qemu-argv', qemu_args])
27@@ -966,7 +966,7 @@ class LibvirtTest(LibvirtTestCommon):
28 self.assertTrue(re.search(search, report), result + report)
29
30 qemu_args = os.path.join(self.tmpdir, "qemu.args.new")
31- contents = '''LC_ALL=C PATH=/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 512 -acpi -smp 2 -name foo -boot c -drive file=/tmp/nonexistent,if=virtio,index=0,boot=on,format=qcow2 -net none serial none -parallel none -usb
32+ contents = '''LC_ALL=C PATH=/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 512 -acpi -smp 2 -name foo -boot c -drive file=/tmp/nonexistent,if=virtio,index=0,format=qcow2 -boot c -net none serial none -parallel none -usb
33 '''
34 testlib.create_fill(qemu_args, contents)
35 rc, report = testlib.cmd(['virsh', '-c', self.connect_uri, 'domxml-from-native', 'qemu-argv', qemu_args])
36diff --git a/scripts/test-qemu.py b/scripts/test-qemu.py
37index 90047da..3be3fc5 100755
38--- a/scripts/test-qemu.py
39+++ b/scripts/test-qemu.py
40@@ -1169,7 +1169,7 @@ class QemuGuestCommon(QemuCommon):
41 '-oUserKnownHostsFile=%s' % os.path.join(os.path.dirname(guest_virtio_vm_tarball), 'qatest-virtio/ssh/known_hosts'),
42 ]
43
44- self.qemu_args += ['-drive', 'file=%s,if=none,id=drive-virtio-disk0,boot=on,format=qcow2' % (self.vmimg_virtio), '-device', 'virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0']
45+ self.qemu_args += ['-drive', 'file=%s,if=none,id=drive-virtio-disk0,format=qcow2' % (self.vmimg_virtio), '-device', 'virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0', '-boot', 'c']
46
47 def _tearDown(self):
48 '''Clean up after each test_* function'''

Subscribers

People subscribed via source and target branches