You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/05/18 19:11:13 UTC
[3/3] allura git commit: [#1731] ticket:767 Fix tests
[#1731] ticket:767 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4cb21fe5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4cb21fe5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4cb21fe5
Branch: refs/heads/ib/1731
Commit: 4cb21fe5124fe7a76c7e238266b25ca3ab2b4430
Parents: 41a9ec9
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon May 18 16:38:25 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon May 18 16:38:25 2015 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_discuss.py | 3 ++-
.../unit/controllers/test_discussion_moderation_controller.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4cb21fe5/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 31e454e..cd30f44 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -171,7 +171,8 @@ class TestDiscuss(TestController):
post = M.Post.query.find().first()
assert post.status == 'ok'
self.app.post(post_link + 'moderate', params=dict(delete='delete'))
- assert M.Post.query.find().count() == 0
+ assert M.Post.query.find().count() == 1
+ assert M.Post.query.find({'deleted': False}).count() == 0
@patch.object(M.Thread, 'is_spam')
def test_feed_does_not_include_comments_held_for_moderation(self, is_spam):
http://git-wip-us.apache.org/repos/asf/allura/blob/4cb21fe5/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
index e6dc38d..e604222 100644
--- a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
+++ b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
@@ -68,7 +68,7 @@ class TestWhenModerating(WithDatabase):
ThreadLocalORMSession.flush_all()
def get_post(self):
- return model.Post.query.get(slug='mypost')
+ return model.Post.query.get(slug='mypost', deleted=False)
class TestIndexWithNoPosts(WithDatabase):