cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 61c5b4b
Date Tue, 20 Aug 2013 14:51:17 GMT
Updated Branches:
  refs/heads/master 3a29c7344 -> 61c5b4bf7


fix for kvm test failure
(cherry picked from commit 6c593b0b16f37951c0c30b2ad3cff69835085fe2)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61c5b4bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61c5b4bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61c5b4bf

Branch: refs/heads/master
Commit: 61c5b4bf7520080d88ae5a9aad38dee7e0348fa2
Parents: 3a29c73
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Sat Aug 17 19:18:43 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Aug 20 20:14:53 2013 +0530

----------------------------------------------------------------------
 .../kvm/resource/LibvirtComputingResourceTest.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61c5b4bf/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 56d6536..3640030 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -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";


Mime
View raw message