From 134e05e005f0639734226f905b6958a12921a04f Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Mon, 14 Dec 2015 14:59:40 -0700
Subject: [PATCH] Xen: tests: remove old xml2sexpr tests

Remove XML to s-expression converstion tests for old xend 3.0.2
config format.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
 .../xml2sexpr-fv-net-ioemu.sexpr              |  9 ------
 .../xml2sexprdata/xml2sexpr-fv-net-ioemu.xml  | 31 -------------------
 .../xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 10 ------
 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml | 23 --------------
 tests/xml2sexprtest.c                         |  7 -----
 5 files changed, 80 deletions(-)
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
deleted file mode 100644
index 20f9228c49..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(localtime 0)\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000')(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml
deleted file mode 100644
index 42185d567c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
deleted file mode 100644
index c2c12907ca..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(vnc 1)(vncunused 0)(vncdisplay 6)\
-(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\
-(localtime 0)\
-(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml
deleted file mode 100644
index f5f15a8b07..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <graphics type='vnc' port='5906' listen="127.0.0.1" passwd="123456" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 47c9db8448..d884a4bbe0 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -107,12 +107,6 @@ mymain(void)
     DO_TEST("pv", "pv", "pvtest", 2);
     DO_TEST("fv", "fv-v2", "fvtest", 2);
     DO_TEST("fv-vncunused", "fv-vncunused", "fvtest", 2);
-#ifdef WITH_RHEL5_API
-    /* RHEL-5 Xen doesn't support the old style vnc configuration */
-    DO_TEST("pv-vfb-orig", "pv-vfb-new", "pvtest", 2);
-#else
-    DO_TEST("pv-vfb-orig", "pv-vfb-orig", "pvtest", 2);
-#endif
     DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3);
     DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3);
     DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1);
@@ -162,7 +156,6 @@ mymain(void)
 
     DO_TEST("fv-sound", "fv-sound", "fvtest", 1);
 
-    DO_TEST("fv-net-ioemu", "fv-net-ioemu", "fvtest", 1);
     DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest", 1);
 
     DO_TEST("boot-grub", "boot-grub", "fvtest", 1);