incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [10/38] git commit: [#5833] ticket:370 Get rid of unneeded test
Date Fri, 21 Jun 2013 21:34:22 GMT
[#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 <jetmind2@gmail.com>
Authored: Thu Jun 13 09:16:12 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
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 '<div class="attachment_thumb" style="min-height: 130px;">' not in r
+        assert '<div class="attachment_thumb">' 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/')


Mime
View raw message