You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2013/11/11 11:19:01 UTC
git commit: updated refs/heads/4.2 to 3e3b1c8
Updated Branches:
refs/heads/4.2 cff7e3933 -> 3e3b1c86e
Fixed missing checkin while merging from master
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e3b1c86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e3b1c86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e3b1c86
Branch: refs/heads/4.2
Commit: 3e3b1c86e1bd9c7f0385b49980141d0de0af18d2
Parents: cff7e39
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Mon Nov 11 15:47:56 2013 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Mon Nov 11 15:47:56 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e3b1c86/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 2a749f0..48d5154 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -33,6 +33,17 @@ 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")