You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/07 20:30:28 UTC
[03/27] git commit: updated refs/heads/ui-restyle to 205f22b
pep8: fix recent pep8 violations
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ed493c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ed493c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ed493c6
Branch: refs/heads/ui-restyle
Commit: 5ed493c6e6d9252e7738a29bf9753d46a75bea41
Parents: 73f6843
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Oct 4 14:13:37 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Oct 4 14:13:37 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/deployAndRun.py | 22 +++++++++++++---------
tools/marvin/marvin/deployDataCenter.py | 4 ++--
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ed493c6/tools/marvin/marvin/deployAndRun.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployAndRun.py b/tools/marvin/marvin/deployAndRun.py
index d162fb3..8a758a1 100644
--- a/tools/marvin/marvin/deployAndRun.py
+++ b/tools/marvin/marvin/deployAndRun.py
@@ -73,20 +73,24 @@ if __name__ == "__main__":
n = 0
while(n < iterates):
engine = \
- TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient,
- deploy.getCfg(),
- testCaseLogFile,
- testResultLogFile)
+ TestCaseExecuteEngine.TestCaseExecuteEngine(
+ deploy.testClient,
+ deploy.getCfg(
+ ),
+ testCaseLogFile,
+ testResultLogFile)
engine.loadTestsFromFile(options.module)
engine.run()
n = n + 1
else:
n = 0
- while(n<iterates):
- engine = TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient,
- deploy.getCfg(),
- testCaseLogFile,
- testResultLogFile)
+ while(n < iterates):
+ engine = TestCaseExecuteEngine.TestCaseExecuteEngine(
+ deploy.testClient,
+ deploy.getCfg(
+ ),
+ testCaseLogFile,
+ testResultLogFile)
engine.loadTestsFromDir(options.testCaseFolder)
engine.run()
n = n + 1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ed493c6/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 8cc9cd4..beed8c8 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -580,8 +580,8 @@ specify a valid config file" % cfgFile)
def copyAttributesToCommand(self, source, command):
map(lambda attr: setattr(command, attr, getattr(source, attr, None)),
- filter(lambda attr: not attr.startswith("__") and
- attr not in ["required", "isAsync"], dir(command)))
+ filter(lambda attr: not attr.startswith("__") and attr not in
+ ["required", "isAsync"], dir(command)))
def configureS3(self, s3):
if s3 is None: