[
https://issues.apache.org/jira/browse/CLOUDSTACK-8292?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14341736#comment-14341736
]
ASF GitHub Bot commented on CLOUDSTACK-8292:
--------------------------------------------
GitHub user K0zka opened a pull request:
https://github.com/apache/cloudstack/pull/91
CLOUDSTACK-8292: fix for java 1.8 build
Refactored to use the XPath expressions to check the generated domain xml
rathern than string comparison.
Signed-off-by: Laszlo Hornyak <[email protected]>
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/K0zka/cloudstack CLOUDSTACK-8292
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/91.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #91
----
commit 0fda5a03a43916a7b3ae59208ba0bfc8b3e5b841
Author: Laszlo Hornyak <[email protected]>
Date: 2015-02-28T18:36:01Z
CLOUDSTACK-8292: fix for java 1.8 compilation
Refactored to use the XPatch expressions to check the generated domain xml
rathern than string comparison.
Signed-off-by: Laszlo Hornyak <[email protected]>
----
> LibvirtComputingResourceTest failson java 1.8
> ---------------------------------------------
>
> Key: CLOUDSTACK-8292
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8292
> Project: CloudStack
> Issue Type: Sub-task
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: Management Server
> Affects Versions: 4.6.0
> Reporter: Laszlo Hornyak
> Assignee: Laszlo Hornyak
>
> {noformat}
> testCreateVMFromSpec(com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest)
> Time elapsed: 0.028 sec <<< FAILURE!
> org.junit.ComparisonFailure: expected:<...ntu</description>
> <c[lock offset='utc'>
> </clock>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <devices>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <console type='pty'>
> <target port='0'/>
> </console>
> <input type='tablet' bus='usb'/>
> </devices>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>2</vcpu>
> <os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <cpu></cpu><on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash]>
> </domain>
> > but was:<...ntu</description>
> <c[pu></cpu><os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>2</vcpu>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <clock offset='utc'>
> </clock>
> <devices>
> <console type='pty'>
> <target port='0'/>
> </console>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <input type='tablet' bus='usb'/>
> </devices]>
> </domain>
> >
> at org.junit.Assert.assertEquals(Assert.java:115)
> at org.junit.Assert.assertEquals(Assert.java:144)
> at
> com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest.testCreateVMFromSpec(LibvirtComputingResourceTest.java:350)
> testCreateVMFromSpecWithTopology4(com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest)
> Time elapsed: 0.001 sec <<< FAILURE!
> org.junit.ComparisonFailure: expected:<...ntu</description>
> <c[lock offset='utc'>
> </clock>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <devices>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <console type='pty'>
> <target port='0'/>
> </console>
> <input type='tablet' bus='usb'/>
> </devices>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>8</vcpu>
> <os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <cpu><topology sockets='2' cores='4' threads='1'
> /></cpu><on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash]>
> </domain>
> > but was:<...ntu</description>
> <c[pu><topology sockets='2' cores='4' threads='1' /></cpu><os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>8</vcpu>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <clock offset='utc'>
> </clock>
> <devices>
> <console type='pty'>
> <target port='0'/>
> </console>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <input type='tablet' bus='usb'/>
> </devices]>
> </domain>
> >
> at org.junit.Assert.assertEquals(Assert.java:115)
> at org.junit.Assert.assertEquals(Assert.java:144)
> at
> com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest.testCreateVMFromSpecWithTopology4(LibvirtComputingResourceTest.java:272)
> testCreateVMFromSpecWithTopology6(com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest)
> Time elapsed: 0.002 sec <<< FAILURE!
> org.junit.ComparisonFailure: expected:<...ntu</description>
> <c[lock offset='utc'>
> </clock>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <devices>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <console type='pty'>
> <target port='0'/>
> </console>
> <input type='tablet' bus='usb'/>
> </devices>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>12</vcpu>
> <os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <cpu><topology sockets='2' cores='6' threads='1'
> /></cpu><on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash]>
> </domain>
> > but was:<...ntu</description>
> <c[pu><topology sockets='2' cores='6' threads='1' /></cpu><os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>12</vcpu>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <clock offset='utc'>
> </clock>
> <devices>
> <console type='pty'>
> <target port='0'/>
> </console>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <input type='tablet' bus='usb'/>
> </devices]>
> </domain>
> >
> at org.junit.Assert.assertEquals(Assert.java:115)
> at org.junit.Assert.assertEquals(Assert.java:144)
> at
> com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest.testCreateVMFromSpecWithTopology6(LibvirtComputingResourceTest.java:202)
> testCreateVMFromSpecLegacy(com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest)
> Time elapsed: 0.002 sec <<< FAILURE!
> org.junit.ComparisonFailure: expected:<...ntu</description>
> <c[lock offset='utc'>
> </clock>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <devices>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <console type='pty'>
> <target port='0'/>
> </console>
> <input type='tablet' bus='usb'/>
> </devices>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>1</vcpu>
> <os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <cpu></cpu><on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash]>
> </domain>
> > but was:<...ntu</description>
> <c[pu></cpu><os>
> <type machine='pc'>hvm</type>
> <boot dev='cdrom'/>
> <boot dev='hd'/>
> </os>
> <on_reboot>restart</on_reboot>
> <on_poweroff>destroy</on_poweroff>
> <on_crash>destroy</on_crash>
> <memory>512</memory>
> <currentMemory>256</currentMemory>
> <devices>
> <memballoon model='virtio'/>
> </devices>
> <vcpu>1</vcpu>
> <features>
> <pae/>
> <apic/>
> <acpi/>
> </features>
> <clock offset='utc'>
> </clock>
> <devices>
> <console type='pty'>
> <target port='0'/>
> </console>
> <serial type='pty'>
> <target port='0'/>
> </serial>
> <graphics type='vnc' autoport='yes' listen='' passwd='mySuperSecretPassword'/>
> <input type='tablet' bus='usb'/>
> </devices]>
> </domain>
> >
> at org.junit.Assert.assertEquals(Assert.java:115)
> at org.junit.Assert.assertEquals(Assert.java:144)
> at
> com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest.testCreateVMFromSpecLegacy(LibvirtComputingResourceTest.java:132)
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
