cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sailajam...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 7d15b50
Date Tue, 01 Oct 2013 05:56:06 GMT
Updated Branches:
  refs/heads/4.2-forward f0b4f8946 -> 7d15b5070


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/7d15b507
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d15b507
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d15b507

Branch: refs/heads/4.2-forward
Commit: 7d15b50704b3b177d2b39fe55e30a9bba0f7b40a
Parents: f0b4f89
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Sep 10 00:25:21 2013 -0400
Committer: sailajam <sailaja.mada@citrix.com>
Committed: Tue Oct 1 11:21:21 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/7d15b507/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):
 


Mime
View raw message