On Thu, Jul 19, 2018 at 05:50:57PM +0200, Peter Krempa wrote:
Unify most of the tests into a common test named disk-cdrom-network
by
adding multiple cdroms. The 'http' test is dropped since there can be
only 4 cdroms.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27 ----------------
tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 ----------------------
.../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27 ----------------
tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 ----------------------
.../qemuxml2argvdata/disk-cdrom-network-http.args | 27 ----------------
tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 ----------------------
.../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27 ----------------
tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 ----------------------
...-network-https.args => disk-cdrom-network.args} | 9 ++++++
...om-network-https.xml => disk-cdrom-network.xml} | 27 ++++++++++++++++
tests/qemuxml2argvtest.c | 6 +---
11 files changed, 37 insertions(+), 257 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args =>
disk-cdrom-network.args} (58%)
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml}
(52%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano