Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1B0FF88E for ; Fri, 3 May 2013 21:57:33 +0000 (UTC) Received: (qmail 48089 invoked by uid 500); 3 May 2013 21:57:33 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 48019 invoked by uid 500); 3 May 2013 21:57:33 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 47059 invoked by uid 99); 3 May 2013 21:57:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 May 2013 21:57:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 94BF888685B; Fri, 3 May 2013 21:57:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Fri, 03 May 2013 21:58:05 -0000 Message-Id: <151f5570d05f4cbe8ae7ef4734b522bd@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] git commit: [#6138] Force all tool_names to be lower-case [#6138] Force all tool_names to be lower-case Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7cc8df70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7cc8df70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7cc8df70 Branch: refs/heads/db/6007 Commit: 7cc8df70ee7a28b8f111434ddc8aafced682a3c5 Parents: dbee43f Author: Cory Johns Authored: Wed May 1 21:35:07 2013 +0000 Committer: Dave Brondsema Committed: Thu May 2 19:06:08 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/project.py | 2 +- Allura/allura/tests/model/test_project.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cc8df70/Allura/allura/model/project.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py index f95aae0..982dad8 100644 --- a/Allura/allura/model/project.py +++ b/Allura/allura/model/project.py @@ -577,7 +577,7 @@ class Project(MappedClass, ActivityNode, ActivityObject): options.update(override_options) cfg = AppConfig( project_id=self._id, - tool_name=ep_name, + tool_name=ep_name.lower(), options=options) app = App(self, cfg) with h.push_config(c, project=self, app=app): http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cc8df70/Allura/allura/tests/model/test_project.py ---------------------------------------------------------------------- diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py index bbff251..232dec5 100644 --- a/Allura/allura/tests/model/test_project.py +++ b/Allura/allura/tests/model/test_project.py @@ -20,7 +20,7 @@ """ Model tests for project """ -from nose.tools import with_setup +from nose.tools import with_setup, assert_equal from pylons import tmpl_context as c from ming.orm.ormsession import ThreadLocalORMSession @@ -62,6 +62,7 @@ def test_project(): c.project.install_app('Wiki', 'hello-test-mount-point') c.project.support_page = 'hello-test-mount-point' + assert_equal(c.project.app_config('wiki').tool_name, 'wiki') ThreadLocalORMSession.flush_all() with td.raises(ToolError): # already installed