tests: qemu: Rename disk-drive-network-tlsx509-vxhs test

Drop the 'vxhs' suffix so other network protocols using TLS can be
put into the same test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args
similarity index 100%
rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509.args

diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml
similarity index 100%
rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5949b02a66052d40596392dc09192dca2402e01f..2d41f78f8bca404e7a5d2f27ba4e5ebf7057e1d4 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1051,7 +1051,7 @@ mymain(void)
     DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE);
     DO_TEST("disk-drive-network-vxhs", QEMU_CAPS_VXHS);
     driver.config->vxhsTLS = 1;
-    DO_TEST("disk-drive-network-tlsx509-vxhs", QEMU_CAPS_VXHS,
+    DO_TEST("disk-drive-network-tlsx509", QEMU_CAPS_VXHS,
             QEMU_CAPS_OBJECT_TLS_CREDS_X509);
     driver.config->vxhsTLS = 0;
     VIR_FREE(driver.config->vxhsTLSx509certdir);

diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 203cd5250bef4c750c9d6b37bed46ba7de767afb..66b823890684b9a0081a80216b7846ff8e4a7fa8 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -381,7 +381,7 @@ mymain(void)
     DO_TEST("disk-drive-network-source-auth", NONE);
     DO_TEST("disk-drive-network-sheepdog", NONE);
     DO_TEST("disk-drive-network-vxhs", NONE);
-    DO_TEST("disk-drive-network-tlsx509-vxhs", NONE);
+    DO_TEST("disk-drive-network-tlsx509", NONE);
     DO_TEST("disk-scsi-device",
             QEMU_CAPS_SCSI_LSI);
     DO_TEST("disk-scsi-vscsi", NONE);