[v2,5/6] tests: qemuxml2xml: Convert genid* to TEST_CAPS

Message ID 8932382b89c789ff855528c086c147d34426336c.1555369583.git.crobinso@redhat.com
State Accepted
Commit 129da536dc33c9b2838e19ac634821c79666fb3f
Headers show
Series
  • tests: qemuxml2xml: add DO_TEST_CAPS*
Related show

Commit Message

Cole Robinson April 15, 2019, 11:09 p.m.
Convert these test cases to use DO_TEST_CAPS_LATEST

* genid
* genid-auto

This ensures the test infrastructure is working as expected for
a test case with explicit -active and -inactive XML test data

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 .../{genid-active.xml => genid-active.x86_64-latest.xml}      | 2 +-
 ...id-auto-active.xml => genid-auto-active.x86_64-latest.xml} | 2 +-
 ...uto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} | 2 +-
 .../{genid-inactive.xml => genid-inactive.x86_64-latest.xml}  | 2 +-
 tests/qemuxml2xmltest.c                                       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/qemuxml2xmloutdata/{genid-active.xml => genid-active.x86_64-latest.xml} (94%)
 rename tests/qemuxml2xmloutdata/{genid-auto-active.xml => genid-auto-active.x86_64-latest.xml} (94%)
 rename tests/qemuxml2xmloutdata/{genid-auto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} (94%)
 rename tests/qemuxml2xmloutdata/{genid-inactive.xml => genid-inactive.x86_64-latest.xml} (94%)

-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Andrea Bolognani April 16, 2019, 9:07 a.m. | #1
On Mon, 2019-04-15 at 19:09 -0400, Cole Robinson wrote:
> Convert these test cases to use DO_TEST_CAPS_LATEST

> 

> * genid

> * genid-auto

> 

> This ensures the test infrastructure is working as expected for

> a test case with explicit -active and -inactive XML test data

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---

>  .../{genid-active.xml => genid-active.x86_64-latest.xml}      | 2 +-

>  ...id-auto-active.xml => genid-auto-active.x86_64-latest.xml} | 2 +-

>  ...uto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} | 2 +-

>  .../{genid-inactive.xml => genid-inactive.x86_64-latest.xml}  | 2 +-

>  tests/qemuxml2xmltest.c                                       | 4 ++--

>  5 files changed, 6 insertions(+), 6 deletions(-)

>  rename tests/qemuxml2xmloutdata/{genid-active.xml => genid-active.x86_64-latest.xml} (94%)

>  rename tests/qemuxml2xmloutdata/{genid-auto-active.xml => genid-auto-active.x86_64-latest.xml} (94%)

>  rename tests/qemuxml2xmloutdata/{genid-auto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} (94%)

>  rename tests/qemuxml2xmloutdata/{genid-inactive.xml => genid-inactive.x86_64-latest.xml} (94%)


Reviewed-by: Andrea Bolognani <abologna@redhat.com>


-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

diff --git a/tests/qemuxml2xmloutdata/genid-active.xml b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-active.xml
rename to tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
index fc41f2dd28..28390e51a6 100644
--- a/tests/qemuxml2xmloutdata/genid-active.xml
+++ b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
@@ -18,7 +18,7 @@ 
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/genid-auto-active.xml b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-auto-active.xml
rename to tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
index aeca0d7fc0..e94846f453 100644
--- a/tests/qemuxml2xmloutdata/genid-auto-active.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
@@ -18,7 +18,7 @@ 
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-auto-inactive.xml
rename to tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
index a7b711d469..f8ab86afa0 100644
--- a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
@@ -18,7 +18,7 @@ 
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/genid-inactive.xml b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-inactive.xml
rename to tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
index 8bd526a7a9..c0813aa1dc 100644
--- a/tests/qemuxml2xmloutdata/genid-inactive.xml
+++ b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
@@ -18,7 +18,7 @@ 
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1d232185ec..812f5c7ea0 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -244,8 +244,8 @@  mymain(void)
     setenv("PATH", "/bin", 1);
 
     DO_TEST("minimal", NONE);
-    DO_TEST("genid", NONE);
-    DO_TEST("genid-auto", NONE);
+    DO_TEST_CAPS_LATEST("genid");
+    DO_TEST_CAPS_LATEST("genid-auto");
     DO_TEST("machine-core-on", NONE);
     DO_TEST("machine-core-off", NONE);
     DO_TEST("machine-loadparm-multiple-disks-nets-s390", NONE);