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/25 19:30:54 UTC
git commit: updated refs/heads/master to 8e72a72
Updated Branches:
refs/heads/master 74df66203 -> 8e72a728b
Fix pep8 that broken marvin build 10 days ago :(
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/8e72a728
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e72a728
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e72a728
Branch: refs/heads/master
Commit: 8e72a728b75d7724e08fa72829d2446f35af1ec6
Parents: 74df662
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Thu Jul 25 22:59:21 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Jul 25 23:00:41 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackTestCase.py | 1 +
tools/marvin/marvin/cloudstackTestClient.py | 2 +-
tools/marvin/marvin/codegenerator.py | 18 +++++++++---------
tools/marvin/marvin/deployDataCenter.py | 3 ++-
tools/marvin/marvin/marvinPlugin.py | 2 --
5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e72a728/tools/marvin/marvin/cloudstackTestCase.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestCase.py b/tools/marvin/marvin/cloudstackTestCase.py
index 742363d..b04342b 100644
--- a/tools/marvin/marvin/cloudstackTestCase.py
+++ b/tools/marvin/marvin/cloudstackTestCase.py
@@ -17,6 +17,7 @@
import unittest
+
def user(Name, DomainName, AcctType):
def wrapper(cls):
orig_init = cls.__init__
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e72a728/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index f8c13d4..36f7f8d 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -198,4 +198,4 @@ class cloudstackTestClient(object):
if self.asyncJobMgr is None:
self.asyncJobMgr = asyncJobMgr.asyncJobMgr(self.apiClient,
self.dbConnection)
- self.asyncJobMgr.submitJobs(jobs, nums_threads, interval)
\ No newline at end of file
+ self.asyncJobMgr.submitJobs(jobs, nums_threads, interval)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e72a728/tools/marvin/marvin/codegenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/codegenerator.py b/tools/marvin/marvin/codegenerator.py
index e37dbcc..96729f6 100644
--- a/tools/marvin/marvin/codegenerator.py
+++ b/tools/marvin/marvin/codegenerator.py
@@ -196,15 +196,15 @@ class codeGenerator(object):
body += 'return CloudStackAPIClient(copy.copy(self.connection))\n'
body += self.newline
-# The `id` property will be used to link the test with the cloud resource being created #
-# @property
-# def id(self):
-# return self._id
-#
-# @id.setter
-# def id(self, identifier):
-# self._id = identifier
-
+ # The `id` property will be used to link the test with the cloud
+ # resource being created
+ # @property
+ # def id(self):
+ # return self._id
+ #
+ # @id.setter
+ # def id(self, identifier):
+ # self._id = identifier
body += self.space + '@property' + self.newline
body += self.space + 'def id(self):' + self.newline
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e72a728/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 2472b20..279d4ee 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -159,7 +159,8 @@ specify a valid config file" % cfgFile)
secondarycmd.provider = secondary.provider
secondarycmd.details = []
- if secondarycmd.provider == 'S3' or secondarycmd.provider == "Swift":
+ if secondarycmd.provider == 'S3' \
+ or secondarycmd.provider == "Swift":
for key, value in vars(secondary.details).iteritems():
secondarycmd.details.append({
'key': key,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e72a728/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 8a548cd..2949109 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -137,8 +137,6 @@ class MarvinPlugin(Plugin):
def _injectClients(self, test):
testcaselogger = logging.getLogger("testclient.testcase.%s" %
test.__name__)
-
-
self.debug_stream. \
setFormatter(logging.
Formatter("%(asctime)s - %(levelname)s - %(name)s" +