Updated Branches: refs/heads/master 9300d4a3b -> ddf4dfa60
marvin: enable the nose-marvin plugin using the --with-marvin directive enable the marvin plugin when the --with-marvin directive is given to nose. The enableOpt value is set from the command line directive and self.enabled (True|False) determines whether marvin's tests will run. By default non-default plugins like marvin will be disabled" This fixes regression from 03830c5 Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ddf4dfa6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ddf4dfa6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ddf4dfa6 Branch: refs/heads/master Commit: ddf4dfa60a0d7d9295ef306c6f03dfd392505c64 Parents: 9300d4a Author: Prasanna Santhanam <t...@apache.org> Authored: Tue Oct 29 15:44:57 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Tue Oct 29 15:46:50 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/cloudstackTestClient.py | 3 --- tools/marvin/marvin/marvinPlugin.py | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddf4dfa6/tools/marvin/marvin/cloudstackTestClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index fbd4aba..be93f35 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -19,9 +19,6 @@ import cloudstackConnection import asyncJobMgr import dbConnection from cloudstackAPI import * -import random -import string -import hashlib ''' @Desc : CloudStackTestClient is encapsulated class for getting various \ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddf4dfa6/tools/marvin/marvin/marvinPlugin.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py index 2a749f0..d5d0291 100644 --- a/tools/marvin/marvin/marvinPlugin.py +++ b/tools/marvin/marvin/marvinPlugin.py @@ -33,6 +33,18 @@ class MarvinPlugin(Plugin): name = "marvin" def configure(self, options, config): + """enable the marvin plugin when the --with-marvin directive + is given to nose. The enableOpt value is set from the command line directive + and self.enabled (True|False) determines whether marvin's tests will run. + By default non-default plugins like marvin will be disabled + """ + if hasattr(options, self.enableOpt): + if not getattr(options, self.enableOpt): + self.enabled = False + return + else: + self.enabled = True + self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - " + "%(name)s - %(message)s")
