etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for kvm test failure 

(cherry picked from commit 6c593b0b16)
This commit is contained in:
Rajesh Battala 2013-08-17 19:18:43 +05:30 committed by Prasanna Santhanam
parent 3a29c73447
commit 61c5b4bf75
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View File

@ -37,7 +37,6 @@ public class LibvirtComputingResourceTest {
String _hyperVisorType = "kvm";
Random _random = new Random();
/**
This test tests if the Agent can handle a vmSpec coming
from a <=4.1 management server.
@ -102,14 +101,13 @@ public class LibvirtComputingResourceTest {
vmStr += "<boot dev='cdrom'/>\n";
vmStr += "<boot dev='hd'/>\n";
vmStr += "</os>\n";
vmStr += "<cputune>\n";
vmStr += "<shares>" + (cpus * speed) + "</shares>\n";
vmStr += "</cputune>\n";
//vmStr += "<cputune>\n";
//vmStr += "<shares>" + (cpus * speed) + "</shares>\n";
//vmStr += "</cputune>\n";
vmStr += "<on_reboot>restart</on_reboot>\n";
vmStr += "<on_poweroff>destroy</on_poweroff>\n";
vmStr += "<on_crash>destroy</on_crash>\n";
vmStr += "</domain>\n";
assertEquals(vmStr, vm.toString());
}
@ -178,9 +176,9 @@ public class LibvirtComputingResourceTest {
vmStr += "<boot dev='cdrom'/>\n";
vmStr += "<boot dev='hd'/>\n";
vmStr += "</os>\n";
vmStr += "<cputune>\n";
vmStr += "<shares>" + (cpus * minSpeed) + "</shares>\n";
vmStr += "</cputune>\n";
//vmStr += "<cputune>\n";
//vmStr += "<shares>" + (cpus * minSpeed) + "</shares>\n";
//vmStr += "</cputune>\n";
vmStr += "<on_reboot>restart</on_reboot>\n";
vmStr += "<on_poweroff>destroy</on_poweroff>\n";
vmStr += "<on_crash>destroy</on_crash>\n";