Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C45CCC7C for ; Thu, 20 Jun 2013 01:17:24 +0000 (UTC) Received: (qmail 18577 invoked by uid 500); 20 Jun 2013 01:17:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18505 invoked by uid 500); 20 Jun 2013 01:17:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 18440 invoked by uid 99); 20 Jun 2013 01:17:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jun 2013 01:17:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B2BA881C384; Thu, 20 Jun 2013 01:17:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Thu, 20 Jun 2013 01:17:25 -0000 Message-Id: <8fd479e8ec074e7fa93b0f19f5b804a3@git.apache.org> In-Reply-To: <5768606a320f457c9d9537f862890850@git.apache.org> References: <5768606a320f457c9d9537f862890850@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/51] [abbrv] git commit: updated refs/heads/object_store to 9aec9c6 CLOUDSTACK-3049: marvin-nose causes other plugins to fail when not enabled enabled by default. Running regular nosetests with plugins other than marvin will fail because of this. Failure manifests itself as nose looking for the config file when using the marivn-nose plugin Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/746af2bb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/746af2bb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/746af2bb Branch: refs/heads/object_store Commit: 746af2bb6f5d356a0ea3fd274d192e2eb9bb83a0 Parents: 97eb35c Author: Prasanna Santhanam Authored: Tue Jun 18 15:06:46 2013 +0530 Committer: Prasanna Santhanam Committed: Tue Jun 18 15:20:58 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/marvinPlugin.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/746af2bb/tools/marvin/marvin/marvinPlugin.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py index 46a8a4f..846f735 100644 --- a/tools/marvin/marvin/marvinPlugin.py +++ b/tools/marvin/marvin/marvinPlugin.py @@ -34,9 +34,15 @@ class MarvinPlugin(Plugin): """ name = "marvin" + def configure(self, options, config): - self.enabled = 1 - self.enableOpt = "--with-marvin" + 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") if options.debug_log: