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 2013/07/22 09:20:41 UTC
git commit: updated refs/heads/master to a75a62a
Updated Branches:
refs/heads/master 2d55914e7 -> a75a62a31
CLOUDSTACK-3075: Test names appended with <module>-<testname>
Prevent chained appending of the testclass/testnames to the accounnt
names.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit fb75f51755a2a0f28766f3e15b3e349151c85334)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a75a62a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a75a62a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a75a62a3
Branch: refs/heads/master
Commit: a75a62a318a6238df69dec7674ea7a587069e1e9
Parents: 2d55914
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Jul 22 12:49:42 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 22 12:50:28 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75a62a3/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 19930d4..ca226f8 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -104,6 +104,7 @@ class MarvinPlugin(Plugin):
Plugin.options(self, parser, env)
def __init__(self):
+ self.identifier = None
Plugin.__init__(self)
def prepareTestRunner(self, runner):
@@ -118,7 +119,7 @@ class MarvinPlugin(Plugin):
def loadTestsFromTestCase(self, cls):
if cls.__name__ != 'cloudstackTestCase':
- self.testclient.identifier = cls.__name__
+ self.identifier = cls.__name__
self._injectClients(cls)
def setClient(self, client):
@@ -131,7 +132,7 @@ class MarvinPlugin(Plugin):
def beforeTest(self, test):
testname = test.__str__().split()[0]
- self.testclient.identifier = '-'.join([self.testclient.identifier, testname])
+ self.testclient.identifier = '-'.join([self.identifier, testname])
def _injectClients(self, test):
testcaselogger = logging.getLogger("testclient.testcase.%s" %