cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject git commit: updated refs/heads/master to 90847df
Date Wed, 27 May 2015 06:20:47 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f2178af31 -> 90847df53


Skip vm migration code from the test since it is not supported on LXC


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

Branch: refs/heads/master
Commit: 90847df531ff267a793ce88bc8483745a37edf7e
Parents: f2178af
Author: sanjeev <sanjeev@apache.org>
Authored: Wed May 27 11:36:06 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Wed May 27 11:50:00 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_cpu_domain_limits.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90847df5/test/integration/component/test_cpu_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_domain_limits.py b/test/integration/component/test_cpu_domain_limits.py
index b2f0146..f3dc564 100644
--- a/test/integration/component/test_cpu_domain_limits.py
+++ b/test/integration/component/test_cpu_domain_limits.py
@@ -483,7 +483,9 @@ class TestDomainCPULimitsUpdateResources(cloudstackTestCase):
 
             self.assertEqual(resource_count_after_delete, expected_resource_count,
                 "Resource count should match with the expected count")
-
+            #vm migration is not supported in LXC. So don't need to execute below vm migration
code
+            if self.hypervisor.lower() in ['lxc']:
+                continue
             host = findSuitableHostForMigration(self.apiclient, vm_2.id)
             if host is None:
                 self.skipTest(ERROR_NO_HOST_FOR_MIGRATION)


Mime
View raw message