You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/04/21 16:47:04 UTC
[7/8] allura git commit: [#7866] ticket:754 Add tests for can_merge
cache helpers
[#7866] ticket:754 Add tests for can_merge cache helpers
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/13ba80ea
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/13ba80ea
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/13ba80ea
Branch: refs/heads/master
Commit: 13ba80eab2acb6934ffb2b9b92e407b46794fbc5
Parents: 17b495b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Sat Apr 18 12:13:49 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Apr 21 08:15:32 2015 +0000
----------------------------------------------------------------------
Allura/allura/tests/model/test_repo.py | 30 ++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/13ba80ea/Allura/allura/tests/model/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index 8b406da..54a30a6 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -729,8 +729,36 @@ class TestMergeRequest(object):
def setUp(self):
setup_basic_test()
setup_global_objects()
- self.mr = M.MergeRequest(app_config=mock.Mock(_id=ObjectId()))
+ self.mr = M.MergeRequest(
+ app_config=mock.Mock(_id=ObjectId()),
+ downstream={'commit_id': '12345'},
+ )
self.mr.app = mock.Mock(forkable=True)
+ self.mr.app.repo.commit.return_value = mock.Mock(_id='09876')
+
+ def test_can_merge_cache_key(self):
+ key = self.mr.can_merge_cache_key()
+ assert_equal(key, '12345-09876')
+
+ def test_get_can_merge_cache(self):
+ key = self.mr.can_merge_cache_key()
+ assert_equal(self.mr.get_can_merge_cache(), None)
+ self.mr.can_merge_cache[key] = True
+ assert_equal(self.mr.get_can_merge_cache(), True)
+
+ self.mr.can_merge_cache_key = lambda: '123-123'
+ self.mr.can_merge_cache['123-123'] = False
+ assert_equal(self.mr.get_can_merge_cache(), False)
+
+ def test_set_can_merge_cache(self):
+ key = self.mr.can_merge_cache_key()
+ assert_equal(self.mr.can_merge_cache, {})
+ self.mr.set_can_merge_cache(True)
+ assert_equal(self.mr.can_merge_cache, {key: True})
+
+ self.mr.can_merge_cache_key = lambda: '123-123'
+ self.mr.set_can_merge_cache(False)
+ assert_equal(self.mr.can_merge_cache, {key: True, '123-123': False})
def test_can_merge(self):
assert_equal(self.mr.can_merge(),