cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to 2be96cf
Date Thu, 25 Jul 2013 17:31:05 GMT
Updated Branches:
  refs/heads/4.2 f350e3457 -> 2be96cf0b


Fix pep8 that broken marvin build 10 days ago :(

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1f95493dfef7762625530f59c4b4de2b6c2165f0)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2be96cf0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2be96cf0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2be96cf0

Branch: refs/heads/4.2
Commit: 2be96cf0b7d8bc155be1b65101bdc8e22e60e233
Parents: f350e34
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Jul 25 22:59:21 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Jul 25 23:00:31 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/2be96cf0/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/2be96cf0/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/2be96cf0/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/2be96cf0/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/2be96cf0/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" +


Mime
View raw message