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 8A06610E4C for ; Tue, 24 Sep 2013 17:37:19 +0000 (UTC) Received: (qmail 18914 invoked by uid 500); 24 Sep 2013 17:37:17 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 18762 invoked by uid 500); 24 Sep 2013 17:37:07 -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 18426 invoked by uid 99); 24 Sep 2013 17:36:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Sep 2013 17:36:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D5497908BB7; Tue, 24 Sep 2013 17:36:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Tue, 24 Sep 2013 17:37:17 -0000 Message-Id: <6b9f31efc821405d8b1ab1c441bee36e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/20] git commit: [#6392] ticket:432 Fix test [#6392] ticket:432 Fix test Can't figure out how to send multiple values to one field in test, so doing it with two different requests. It works through web, though. Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/323d01c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/323d01c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/323d01c0 Branch: refs/heads/master Commit: 323d01c06ba65b3613ba9db038cca5fd4ef16135 Parents: 52b7043 Author: Igor Bondarenko Authored: Fri Sep 13 13:42:23 2013 +0300 Committer: Tim Van Steenburgh Committed: Tue Sep 24 17:36:25 2013 +0000 ---------------------------------------------------------------------- Allura/allura/tests/functional/test_admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/323d01c0/Allura/allura/tests/functional/test_admin.py ---------------------------------------------------------------------- diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py index b5a3569..38a7272 100644 --- a/Allura/allura/tests/functional/test_admin.py +++ b/Allura/allura/tests/functional/test_admin.py @@ -223,7 +223,9 @@ class TestProjectAdmin(TestController): assert 'test-admin (Spammer)' % admin._id in r assert 'test-user' % user._id in r - self.app.post('/admin/wiki/unblock_user', params={'user_id': [str(user._id), str(admin._id)], 'perm': 'read'}) + self.app.post('/admin/wiki/unblock_user', params={'user_id': str(user._id), 'perm': 'read'}) + self.app.post('/admin/wiki/unblock_user', params={'user_id': str(admin._id), 'perm': 'read'}) + app = M.Project.query.get(shortname='test').app_instance('wiki') assert M.ACL.contains(deny_admin, app.acl) is None assert M.ACL.contains(deny_user, app.acl) is None r = self.app.get('/admin/wiki/permissions')