← Back to branch summary

~raharper/qa-regression-testing/scripts-test-qemu-fixups-v2

« back to all changes in this revision

Viewing changes to scripts/test-qemu.py

  • Committer: Ryan Harper
  • Date: 2014-02-04 21:19:14 UTC
  • Revision ID: ryan.harper@ubuntu.com-20140204211914-228d1ywq0v5oxp3c
test-qemu.py fix up testing of kvm-pci-assign, can only startvm when not running in a vm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/test-qemu.py
955
955
 
956
956
        # devices in Raring and higher
957
957
        if self.lsb_release['Release'] >= 13.04:
958
 
            devices += ['pc-testdev',]
959
 
            # kvm-pci-assign can only run on baremetal
960
 
            if self.is_vm:
961
 
                devices += ['kvm-pci-assign',]
 
958
            devices += ['kvm-pci-assign',
 
959
                        'pc-testdev',
 
960
                        ]
962
961
 
963
962
        # Can we start with the device? (excepting problematic ones)
964
963
        no_start_devices = [
1028
1027
                 'scsi-hd',     # needs a disk
1029
1028
                 'scsi-cd',     # needs a disk
1030
1029
                ]
 
1030
            if self.is_vm:
 
1031
                no_start_devices += [
 
1032
                 'kvm-pci-assign',     # needs baremetal
 
1033
                ]
 
1034
 
1031
1035
 
1032
1036
        emulator='qemu-system-i386'
1033
1037
        if self.lsb_release['Release'] < 12.04: