cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [46/50] [abbrv] git commit: updated refs/heads/disk-cache to c3569db
Date Tue, 17 Sep 2013 14:02:07 GMT
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/4b79858c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b79858c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b79858c

Branch: refs/heads/disk-cache
Commit: 4b79858c0199bdb34051fa1f69c2a54e3ddc9fcd
Parents: f1f5f2e
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Sep 10 01:42:50 2013 -0400
Committer: sailajam <sailaja.mada@citrix.com>
Committed: Mon Sep 16 15:55:07 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/4b79858c/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):
 


Mime
View raw message