You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/09/16 12:34:28 UTC
git commit: updated refs/heads/master to 51da534
Updated Branches:
refs/heads/master 4b79858c0 -> 51da534cc
CLOUDSTACK-4634: Fixed issue arising due to wrong indentation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51da534c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51da534c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51da534c
Branch: refs/heads/master
Commit: 51da534cce7bd07dcbf1e828a32e27a716b5b0f8
Parents: 4b79858
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Sep 10 00:25:21 2013 -0400
Committer: sailajam <sa...@citrix.com>
Committed: Mon Sep 16 15:59:51 2013 +0530
----------------------------------------------------------------------
.../component/cpu_limits/test_maximum_limits.py | 56 ++++++++++----------
1 file changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51da534c/test/integration/component/cpu_limits/test_maximum_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_maximum_limits.py b/test/integration/component/cpu_limits/test_maximum_limits.py
index 2302504..9161cee 100644
--- a/test/integration/component/cpu_limits/test_maximum_limits.py
+++ b/test/integration/component/cpu_limits/test_maximum_limits.py
@@ -137,34 +137,34 @@ class TestMaxCPULimits(cloudstackTestCase):
if api_client is None:
api_client = self.apiclient
- self.debug("Deploying instance")
- try:
- if account:
- vm = VirtualMachine.create(
- api_client,
- self.services["virtual_machine"],
- templateid=self.template.id,
- accountid=account.name,
- domainid=account.domainid,
- networkids=networks,
- serviceofferingid=service_off.id)
- elif project:
- vm = VirtualMachine.create(
- api_client,
- self.services["virtual_machine"],
- templateid=self.template.id,
- projectid=project.id,
- networkids=networks,
- serviceofferingid=service_off.id)
- vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
- self.assertIsInstance(vms,
- list,
- "List VMs should return a valid response")
- self.assertEqual(vms[0].state, "Running",
- "Vm state should be running after deployment")
- return vm
- except Exception as e:
- self.fail("Failed to deploy an instance: %s" % e)
+ self.debug("Deploying instance")
+ try:
+ if account:
+ vm = VirtualMachine.create(
+ api_client,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ accountid=account.name,
+ domainid=account.domainid,
+ networkids=networks,
+ serviceofferingid=service_off.id)
+ elif project:
+ vm = VirtualMachine.create(
+ api_client,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ projectid=project.id,
+ networkids=networks,
+ serviceofferingid=service_off.id)
+ vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+ self.assertIsInstance(vms,
+ list,
+ "List VMs should return a valid response")
+ self.assertEqual(vms[0].state, "Running",
+ "Vm state should be running after deployment")
+ return vm
+ except Exception as e:
+ self.fail("Failed to deploy an instance: %s" % e)
def setupAccounts(self, account_limit=2, domain_limit=2, project_limit=2):