Fix test case for change in bootloader handling

diff --git a/ChangeLog b/ChangeLog
index dd51667062108cc22883e43fe5d18323a984dc10..ae8fe2b4af884698d19eea809a022056263df94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec  6 17:40:03 EST 2006 Daniel Berrange <berrange@redhat.com>
+
+       * test/xml2sexprdata/xml2sexpr-curmem.xml, test/xml2sexprdata/xml2sexpr-curmem.sexpr:
+       Fix test case to reflect recent change to bootloader/image handling
+
 Wed Dec  6 15:06:28 CET 2006 Daniel Veillard <veillard@redhat.com>
 
        * src/xen_internal.c: the structure passed to the vcpuinfo hypercall

diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
index 1ad4a784f5601e1ad3ed8801099c121a5a2b484b..e1b589e0133eff0538f7b055ecbfe0a86e15f445 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
@@ -1 +1 @@
-(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2301958e83bab6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (linux (kernel '/var/lib/xen/vmlinuz.blj7cs')(ramdisk '/var/lib/xen/initrd.gULTf1')(args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet')(vnc 1)(vncdisplay 5)))(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file
+(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2301958e83bab6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file

diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml b/tests/xml2sexprdata/xml2sexpr-curmem.xml
index 55d49d32eb4919f4ddd6ef2f30a31843b7e8a20b..3347a7d35d0a7cc1b1dcfa3eb655d473ed67be8c 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-curmem.xml
+++ b/tests/xml2sexprdata/xml2sexpr-curmem.xml
@@ -2,12 +2,6 @@
   <name>rhel5</name>
   <uuid>4f77abd2301958e83bab6fbf2118f880</uuid>
   <bootloader>/usr/bin/pygrub</bootloader>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.blj7cs</kernel>
-    <initrd>/var/lib/xen/initrd.gULTf1</initrd>
-    <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline>
-  </os>
   <memory>394240</memory>
   <currentMemory>179200</currentMemory>
   <vcpu>1</vcpu>