diff options
| author | Cole Robinson <crobinso@redhat.com> | 2019-05-11 16:50:52 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2019-05-12 17:25:47 -0400 |
| commit | efa8c6f2c0a37051f415f666b5fef78cd1613965 (patch) | |
| tree | 9dd175c46551297b13ffff7e7e03dc14c4022dad /tests | |
| parent | 4238e3f7d7e62f5a4ed6c3328732a0de628f76c7 (diff) | |
| download | virt-manager-efa8c6f2c0a37051f415f666b5fef78cd1613965.tar.gz | |
osdict: Don't limit qemu TCG to vcpus=1
Modern qemu has multithread TCG support for all the arches we
support, so don't limit things
Diffstat (limited to 'tests')
8 files changed, 7 insertions, 11 deletions
diff --git a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml index be1c21f5..3317be60 100644 --- a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml +++ b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="armv7l" machine="virt">hvm</type> <kernel>/f19-arm.kernel</kernel> diff --git a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml index 485aeeb2..bd289eb0 100644 --- a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml +++ b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="armv7l" machine="virt">hvm</type> <kernel>/f19-arm.kernel</kernel> diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml index e80e4c6f..67793929 100644 --- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml +++ b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="ppc64" machine="pseries">hvm</type> <boot dev="network"/> diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml index 358d9ec2..7f4895af 100644 --- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml +++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="ppc64" machine="pseries">hvm</type> <boot dev="network"/> diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml index d00e0cf4..dd5ef46a 100644 --- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml +++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="x86_64" machine="pc">hvm</type> <boot dev="cdrom"/> diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml b/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml index f2f1b842..4759d3db 100644 --- a/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml +++ b/tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="riscv64" machine="virt">hvm</type> <boot dev="hd"/> diff --git a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml b/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml index 875a4214..b2ea260c 100644 --- a/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml +++ b/tests/cli-test-xml/compare/virt-install-riscv64-headless.xml @@ -8,7 +8,7 @@ </metadata> <memory>65536</memory> <currentMemory>65536</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> <type arch="riscv64" machine="virt">hvm</type> <boot dev="hd"/> diff --git a/tests/osdict.py b/tests/osdict.py index 57b0dea5..329da07c 100644 --- a/tests/osdict.py +++ b/tests/osdict.py @@ -32,10 +32,6 @@ class TestOSDB(unittest.TestCase): res = OSDB.lookup_os("fedora21").get_recommended_resources(guest) assert res["n-cpus"] == 2 - guest.type = "qemu" - res = OSDB.lookup_os("fedora21").get_recommended_resources(guest) - assert res["n-cpus"] == 1 - def test_urldetct_matching_distros(self): allstores = urldetect.ALLSTORES |