You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/06/23 17:30:38 UTC
git commit: updated refs/heads/master to d53f1c0
Updated Branches:
refs/heads/master 3f4204b8b -> d53f1c094
CLOUDSTACK-3096 format cloudstackTestCase.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d53f1c09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d53f1c09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d53f1c09
Branch: refs/heads/master
Commit: d53f1c0946ca05504cff4f4af54a6b40413da06b
Parents: 3f4204b
Author: Daan Hoogland <da...@onecht.net>
Authored: Sat Jun 22 23:25:52 2013 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Sun Jun 23 11:30:30 2013 -0400
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackTestCase.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d53f1c09/tools/marvin/marvin/cloudstackTestCase.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestCase.py b/tools/marvin/marvin/cloudstackTestCase.py
index 7e557f8..114928c 100644
--- a/tools/marvin/marvin/cloudstackTestCase.py
+++ b/tools/marvin/marvin/cloudstackTestCase.py
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,9 +31,11 @@ import cloudstackTestClient
# cls.AcctType = self.accounttype
# return Wrapped
+
def user(Name, DomainName, AcctType):
def wrapper(cls):
orig_init = cls.__init__
+
def __init__(self, *args, **kws):
cls.UserName = Name
cls.DomainName = DomainName
@@ -43,13 +45,14 @@ def user(Name, DomainName, AcctType):
return cls
return wrapper
+
class cloudstackTestCase(unittest.case.TestCase):
clstestclient = None
-
+
def __init__(self, args):
unittest.case.TestCase.__init__(self, args)
# self.testClient = cloudstackTestClient.cloudstackTestClient()
-
+
@classmethod
def getClsTestClient(cls):
return cls.clstestclient