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 C75C5104EE for ; Fri, 21 Jun 2013 21:34:14 +0000 (UTC) Received: (qmail 88623 invoked by uid 500); 21 Jun 2013 21:34:14 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 88511 invoked by uid 500); 21 Jun 2013 21:34:14 -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 88370 invoked by uid 99); 21 Jun 2013 21:34:14 -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, 21 Jun 2013 21:34:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E83082D36E; Fri, 21 Jun 2013 21:34:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Fri, 21 Jun 2013 21:34:22 -0000 Message-Id: <432986b05ff242f0b1944102d3e5d6ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/38] git commit: [#5833] ticket:370 Get rid of unneeded test [#5833] ticket:370 Get rid of unneeded test Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d8712902 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d8712902 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d8712902 Branch: refs/heads/cj/6272 Commit: d87129025a8e972cb2469bc371c2490b245bb687 Parents: 1288e7b Author: Igor Bondarenko Authored: Thu Jun 13 09:16:12 2013 +0000 Committer: Cory Johns Committed: Mon Jun 17 14:15:56 2013 +0000 ---------------------------------------------------------------------- Allura/allura/tests/functional/test_discuss.py | 2 +- ForgeWiki/forgewiki/tests/functional/test_root.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8712902/Allura/allura/tests/functional/test_discuss.py ---------------------------------------------------------------------- diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py index 0573340..9e65280 100644 --- a/Allura/allura/tests/functional/test_discuss.py +++ b/Allura/allura/tests/functional/test_discuss.py @@ -220,7 +220,7 @@ class TestAttachment(TestController): break else: assert False, 'attachment link not found' - assert '

' not in r + assert '

' in r r = self.app.get(alink) assert r.content_disposition == 'attachment;filename="test.txt"', 'Attachments should force download' r = self.app.post(self.post_link + 'attach', http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8712902/ForgeWiki/forgewiki/tests/functional/test_root.py ---------------------------------------------------------------------- diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py index 0b8ad0d..f3570b2 100644 --- a/ForgeWiki/forgewiki/tests/functional/test_root.py +++ b/ForgeWiki/forgewiki/tests/functional/test_root.py @@ -388,18 +388,10 @@ class TestRootController(TestController): thumbnail = PIL.Image.open(StringIO.StringIO(r.body)) assert thumbnail.size == (255,255) - # Make sure thumbnail is present - r = self.app.get('/wiki/TEST/') - img_srcs = [ i['src'] for i in r.html.findAll('img') ] - assert ('/p/test/wiki/TEST/attachment/' + filename + '/thumb') not in img_srcs, img_srcs - # Update the page to embed the image, make sure the thumbnail is absent - self.app.post('/wiki/TEST/update', params=dict( - title='TEST', - text='sometext\n[[img src=%s alt=]]' % file_name)) + # Make sure thumbnail is absent r = self.app.get('/wiki/TEST/') img_srcs = [ i['src'] for i in r.html.findAll('img') ] assert ('/p/test/wiki/TEST/attachment/' + filename) not in img_srcs, img_srcs - assert ('./attachment/' + file_name) in img_srcs, img_srcs def test_sidebar_static_page(self): response = self.app.get('/wiki/tést/')