Re: [libvirt] [PATCH 11/11] tests: Clean up HPT tests

2018-02-12 Thread John Ferlan 


On 02/06/2018 11:43 AM, Andrea Bolognani wrote:
> Give them better names and remove some redundancy.
> 
> Signed-off-by: Andrea Bolognani 
> ---
>  ...es-hpt-resizing.args => pseries-features-hpt.args} |  1 -
>  .../pseries-features-hpt.xml} |  0
>  ...chine.xml => pseries-features-invalid-machine.xml} |  2 +-
>  tests/qemuxml2argvdata/pseries-hpt-resizing.xml   | 19 
> ---
>  tests/qemuxml2argvtest.c  | 11 +++
>  tests/qemuxml2xmloutdata/pseries-features-hpt.xml |  1 +
>  tests/qemuxml2xmltest.c   |  3 +--
>  7 files changed, 6 insertions(+), 31 deletions(-)
>  rename tests/qemuxml2argvdata/{pseries-hpt-resizing.args => 
> pseries-features-hpt.args} (96%)
>  rename tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => 
> qemuxml2argvdata/pseries-features-hpt.xml} (100%)
>  rename tests/qemuxml2argvdata/{pseries-hpt-resizing-invalid-machine.xml => 
> pseries-features-invalid-machine.xml} (86%)
>  delete mode 100644 tests/qemuxml2argvdata/pseries-hpt-resizing.xml
>  create mode 12 tests/qemuxml2xmloutdata/pseries-features-hpt.xml
> 

Reviewed-by: John Ferlan 

John

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

[libvirt] [PATCH 11/11] tests: Clean up HPT tests

2018-02-06 Thread Andrea Bolognani 
Give them better names and remove some redundancy.

Signed-off-by: Andrea Bolognani 
---
 ...es-hpt-resizing.args => pseries-features-hpt.args} |  1 -
 .../pseries-features-hpt.xml} |  0
 ...chine.xml => pseries-features-invalid-machine.xml} |  2 +-
 tests/qemuxml2argvdata/pseries-hpt-resizing.xml   | 19 ---
 tests/qemuxml2argvtest.c  | 11 +++
 tests/qemuxml2xmloutdata/pseries-features-hpt.xml |  1 +
 tests/qemuxml2xmltest.c   |  3 +--
 7 files changed, 6 insertions(+), 31 deletions(-)
 rename tests/qemuxml2argvdata/{pseries-hpt-resizing.args => 
pseries-features-hpt.args} (96%)
 rename tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => 
qemuxml2argvdata/pseries-features-hpt.xml} (100%)
 rename tests/qemuxml2argvdata/{pseries-hpt-resizing-invalid-machine.xml => 
pseries-features-invalid-machine.xml} (86%)
 delete mode 100644 tests/qemuxml2argvdata/pseries-hpt-resizing.xml
 create mode 12 tests/qemuxml2xmloutdata/pseries-features-hpt.xml

diff --git a/tests/qemuxml2argvdata/pseries-hpt-resizing.args 
b/tests/qemuxml2argvdata/pseries-features-hpt.args
similarity index 96%
rename from tests/qemuxml2argvdata/pseries-hpt-resizing.args
rename to tests/qemuxml2argvdata/pseries-features-hpt.args
index 994789a5e..8cdb32965 100644
--- a/tests/qemuxml2argvdata/pseries-hpt-resizing.args
+++ b/tests/qemuxml2argvdata/pseries-features-hpt.args
@@ -12,7 +12,6 @@ QEMU_AUDIO_DRV=none \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
--nodefconfig \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
 server,nowait \
diff --git a/tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml 
b/tests/qemuxml2argvdata/pseries-features-hpt.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml
rename to tests/qemuxml2argvdata/pseries-features-hpt.xml
diff --git a/tests/qemuxml2argvdata/pseries-hpt-resizing-invalid-machine.xml 
b/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
similarity index 86%
rename from tests/qemuxml2argvdata/pseries-hpt-resizing-invalid-machine.xml
rename to tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
index 757fcc70e..5a6bb02d5 100644
--- a/tests/qemuxml2argvdata/pseries-hpt-resizing-invalid-machine.xml
+++ b/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
@@ -7,7 +7,7 @@
 hvm
   
   
-
+
 
   
   
diff --git a/tests/qemuxml2argvdata/pseries-hpt-resizing.xml 
b/tests/qemuxml2argvdata/pseries-hpt-resizing.xml
deleted file mode 100644
index f9dc9cac9..0
--- a/tests/qemuxml2argvdata/pseries-hpt-resizing.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-  guest
-  1ccfd97d-5eb4-478a-bbe6-88d254c16db7
-  524288
-  1
-  
-hvm
-  
-  
-
-
-  
-  
-/usr/bin/qemu-system-ppc64
-
-
-  
-
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index dd64772e2..3aa69fcee 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1891,17 +1891,12 @@ mymain(void)
 QEMU_CAPS_VIRTIO_SCSI,
 QEMU_CAPS_DEVICE_VFIO_PCI);
 
-DO_TEST("pseries-hpt-resizing",
-QEMU_CAPS_NODEFCONFIG,
+DO_TEST("pseries-features-hpt",
 QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-DO_TEST_FAILURE("pseries-hpt-resizing",
-QEMU_CAPS_NODEFCONFIG,
+DO_TEST_FAILURE("pseries-features-hpt",
 QEMU_CAPS_MACHINE_OPT);
-DO_TEST_PARSE_ERROR("pseries-hpt-resizing-invalid-machine",
-QEMU_CAPS_NODEFCONFIG,
-QEMU_CAPS_MACHINE_OPT,
-QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
+DO_TEST_PARSE_ERROR("pseries-features-invalid-machine", NONE);
 
 DO_TEST("pseries-serial-native",
 QEMU_CAPS_NODEFCONFIG,
diff --git a/tests/qemuxml2xmloutdata/pseries-features-hpt.xml 
b/tests/qemuxml2xmloutdata/pseries-features-hpt.xml
new file mode 12
index 0..bcaf2e6fe
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-features-hpt.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pseries-features-hpt.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 83809574c..0eb9e6c77 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -763,8 +763,7 @@ mymain(void)
 QEMU_CAPS_VIRTIO_SCSI,
 QEMU_CAPS_DEVICE_VFIO_PCI);
 
-DO_TEST("pseries-hpt-resizing",
-QEMU_CAPS_NODEFCONFIG,
+DO_TEST("pseries-features-hpt",
 QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
 
-- 
2.14.3

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