cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/marvin to 08b87c0
Date Tue, 08 Apr 2014 09:33:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/marvin bacfd109e -> 08b87c040


CLOUDSTACK-6316: Fixed bvt failures


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

Branch: refs/heads/marvin
Commit: 08b87c0409e0baff87b046542caea9adbd515d82
Parents: bacfd10
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Tue Apr 8 15:02:37 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Tue Apr 8 15:02:37 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_network_offering.py | 10 +++++-----
 tools/marvin/marvin/cloudstackTestClient.py         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08b87c04/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index da43e8a..67e3234 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -1180,15 +1180,15 @@ class TestNOWithOnlySourceNAT(cloudstackTestCase):
     @classmethod
     def setUpClass(cls):
         cls.testClient = super(TestNOWithOnlySourceNAT, cls).getClsTestClient()
-        cls.apiClient = cls.testClient.getApiClient()
+        cls.apiclient = cls.testClient.getApiClient()
 
         cls.services = Services().services
         # Get Zone, Domain and templates
-        cls.domain = get_domain(cls.apiClient)
-        cls.zone = get_zone(cls.apiClient, cls.testClient.getZoneForTests())
+        cls.domain = get_domain(cls.apiclient)
+        cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
         cls.services['mode'] = cls.zone.networktype
         cls.template = get_template(
-            cls.apiClient,
+            cls.apiclient,
             cls.zone.id,
             cls.services["ostype"]
         )
@@ -1197,7 +1197,7 @@ class TestNOWithOnlySourceNAT(cloudstackTestCase):
         cls.services["virtual_machine"]["template"] = cls.template.id
 
         cls.service_offering = ServiceOffering.create(
-            cls.apiClient,
+            cls.apiclient,
             cls.services["service_offering"]
         )
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08b87c04/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 281057b..f1afceb 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -416,7 +416,7 @@ class CSTestClient(object):
         @Desc : FixME, httplib has issue if more than one thread submitted
         '''
         if self.__asyncJobMgr is None:
-            self.__asyncJobMgr = asyncJobMgr.asyncJobMgr(self.__apiClient,
+            self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
                                                          self.__dbConnection)
         return self.__asyncJobMgr.submitCmdsAndWait(cmds, workers)
 


Mime
View raw message