You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/12/10 07:16:59 UTC
[2/3] git commit: Smoke Tests: incorrect self reference in setUpClass
Smoke Tests: incorrect self reference in setUpClass
should be cls.apiClient and not self.apiClient
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3ba8dc45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3ba8dc45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3ba8dc45
Branch: refs/heads/master
Commit: 3ba8dc455f446f695225ee06efa81258067fb236
Parents: 8466ff1
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sun Dec 9 22:04:27 2012 -0800
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Dec 9 22:15:37 2012 -0800
----------------------------------------------------------------------
test/integration/smoke/test_iso.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ba8dc45/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index fc72672..23c5786 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -218,7 +218,7 @@ class TestISO(cloudstackTestCase):
cls.services["account"] = cls.account.account.name
# Finding the OsTypeId from Ostype
ostypes = list_os_types(
- self.apiclient,
+ cls.apiclient,
description=self.services["ostype"]
)
if not isinstance(ostypes, list):
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ba8dc45/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 2502656..cb63179 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -137,7 +137,13 @@ class cloudstackTestClient(object):
def getApiClient(self):
return self.apiClient
- def getUserApiClient(self):
+ def getUserApiClient(self, account, domain, type=0):
+ """
+ 0 - user
+ 1 - admin
+ 2 - domain admin
+ """
+ self.createUserApiClient(account, domain, type)
if hasattr(self, "userApiClient"):
return self.userApiClient
return None