You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/08/16 12:56:20 UTC
[49/50] git commit: updated refs/heads/saml2 to 09da909
Added few change for test suite result location
Signed-off-by: Santhosh Edukulla <sa...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34b698d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34b698d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34b698d4
Branch: refs/heads/saml2
Commit: 34b698d44d7cbb0512ace813176636fc0dd4259e
Parents: 2be02d1
Author: Santhosh Edukulla <sa...@gmail.com>
Authored: Sat Aug 16 01:03:12 2014 +0530
Committer: Santhosh Edukulla <sa...@gmail.com>
Committed: Sat Aug 16 01:06:41 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34b698d4/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 52a2cde..dfba4c1 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -288,6 +288,7 @@ class MarvinPlugin(Plugin):
def finalize(self, result):
try:
src = self.__logFolderPath
+ tmp = ''
if not self.__userLogPath:
log_cfg = self.__parsedConfig.logger
tmp = log_cfg.__dict__.get('LogFolderPath') + "/MarvinLogs"
@@ -299,7 +300,7 @@ class MarvinPlugin(Plugin):
mod_name = self.__testModName.split(".")
if len(mod_name) > 2:
mod_name = mod_name[-2]
- if mod_name:
+ if mod_name and type(mod_name) is str:
dst = tmp + "/" + mod_name + "_" + random_gen()
cmd = "mv " + src + " " + dst
os.system(cmd)