CLOUDSTACK: 4635 - Fixed test case issues 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/b35e7613 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b35e7613 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b35e7613 Branch: refs/heads/4.2 Commit: b35e76132d280496c1c32bdfb371cb993829b426 Parents: 7d15b50 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Tue Sep 10 01:42:50 2013 -0400 Committer: sailajam <sailaja.m...@citrix.com> Committed: Tue Oct 1 11:23:01 2013 +0530 ---------------------------------------------------------------------- .../component/cpu_limits/test_domain_limits.py | 68 ++++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b35e7613/test/integration/component/cpu_limits/test_domain_limits.py ---------------------------------------------------------------------- diff --git a/test/integration/component/cpu_limits/test_domain_limits.py b/test/integration/component/cpu_limits/test_domain_limits.py index 2668204..4e8fc6d 100644 --- a/test/integration/component/cpu_limits/test_domain_limits.py +++ b/test/integration/component/cpu_limits/test_domain_limits.py @@ -142,26 +142,26 @@ class TestDomainCPULimitsUpdateResources(cloudstackTestCase): if api_client is None: api_client = self.apiclient - self.debug("Deploying an instance in account: %s" % + self.debug("Deploying an instance in account: %s" % self.account.name) - try: - vm = VirtualMachine.create( - api_client, - self.services["virtual_machine"], - templateid=self.template.id, - accountid=self.account.name, - domainid=self.account.domainid, - 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", + try: + vm = VirtualMachine.create( + api_client, + self.services["virtual_machine"], + templateid=self.template.id, + accountid=self.account.name, + domainid=self.account.domainid, + 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) + return vm + except Exception as e: + self.fail("Failed to deploy an instance: %s" % e) def setupAccounts(self): @@ -547,26 +547,26 @@ class TestMultipleChildDomains(cloudstackTestCase): if api_client is None: api_client = self.apiclient - self.debug("Deploying an instance in account: %s" % + self.debug("Deploying an instance in account: %s" % account.name) - try: - 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) - vms = VirtualMachine.list(api_client, id=vm.id, listall=True) - self.assertIsInstance(vms, + try: + 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) + 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", + 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) + return vm + except Exception as e: + self.fail("Failed to deploy an instance: %s" % e) def setupAccounts(self):
