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/27 13:57:54 UTC
[22/50] [abbrv] allura git commit: [#7836] ticket:739 Add/fix tests
[#7836] ticket:739 Add/fix tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/26d80abb
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/26d80abb
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/26d80abb
Branch: refs/heads/ib/7868
Commit: 26d80abb6f370a121b25bfa9d933d1810d63e53c
Parents: d98da98
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 22 09:40:12 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed May 20 19:43:17 2015 +0000
----------------------------------------------------------------------
.../tests/functional/test_controllers.py | 6 ++---
.../forgegit/tests/model/test_repository.py | 28 +++++++++++++++++++-
2 files changed, 30 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/26d80abb/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 9dd4852..9de228a 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -695,10 +695,10 @@ class TestFork(_TestCase):
r = self.app.get('/p/test/src-git/merge-requests').follow()
assert '<a href="1/">changed summary</a>' in r
- @patch.object(GM.Repository, 'merge_base', autospec=True)
- def test_merge_base_error(self, merge_base):
+ @patch.object(GM.Repository, 'merge_request_commits', autospec=True)
+ def test_merge_request_commits_error(self, mr_commits):
r, mr_num = self._request_merge()
- merge_base.side_effect = Exception
+ mr_commits.side_effect = Exception
r = self.app.get('/p/test/src-git/merge-requests/%s/' % mr_num)
err = r.html.find('div', attrs={'class': 'grid-19 error'})
assert_in("Can't find commits to merge", err.getText())
http://git-wip-us.apache.org/repos/asf/allura/blob/26d80abb/ForgeGit/forgegit/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index b8506c9..e516f35 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -693,9 +693,35 @@ class TestGitRepo(unittest.TestCase, RepoImplTestBase):
source_branch='zz',
target_branch='master',
)
- res = self.repo.merge_base(mr)
+ res = self.repo._impl.merge_base(mr)
assert_equal(res, '1e146e67985dcd71c74de79613719bef7bddca4a')
+ def test_merge_request_commits(self):
+ mr = M.MergeRequest(
+ downstream={
+ 'commit_id': '5c47243c8e424136fd5cdd18cd94d34c66d1955c',
+ },
+ source_branch='zz',
+ target_branch='master',
+ )
+ res = self.repo.merge_request_commits(mr)
+ expected = [
+ {'authored': {
+ 'date': datetime.datetime(2013, 3, 28, 18, 54, 16),
+ 'email': u'cjohns@slashdotmedia.com',
+ 'name': u'Cory Johns'},
+ 'committed': {
+ 'date': datetime.datetime(2013, 3, 28, 18, 54, 16),
+ 'email': u'cjohns@slashdotmedia.com',
+ 'name': u'Cory Johns'},
+ 'id': '5c47243c8e424136fd5cdd18cd94d34c66d1955c',
+ 'message': u'Not repo root\n',
+ 'parents': ['1e146e67985dcd71c74de79613719bef7bddca4a'],
+ 'refs': ['zz'],
+ 'rename_details': {},
+ 'size': None}]
+ assert_equals(res, expected)
+
class TestGitImplementation(unittest.TestCase):