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/25 17:49:35 UTC

[05/16] allura git commit: [#7836] ticket:739 Add/fix some tests

[#7836] ticket:739 Add/fix some tests


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a96649cd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a96649cd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a96649cd

Branch: refs/heads/ib/1731
Commit: a96649cdf1e6428bc84fc7ae0d53af7971114f82
Parents: 1fda8a7
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Mar 5 15:57:23 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed May 20 19:43:16 2015 +0000

----------------------------------------------------------------------
 ForgeGit/forgegit/tests/functional/test_controllers.py |  8 ++++++++
 ForgeGit/forgegit/tests/model/test_repository.py       | 11 +++++++++++
 ForgeSVN/forgesvn/model/svn.py                         |  4 ++++
 3 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/a96649cd/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 7458ba8..9dd4852 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -695,6 +695,14 @@ 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):
+        r, mr_num = self._request_merge()
+        merge_base.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())
+
 
 class TestDiff(TestController):
 

http://git-wip-us.apache.org/repos/asf/allura/blob/a96649cd/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 dbc12b0..b8506c9 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -685,6 +685,17 @@ class TestGitRepo(unittest.TestCase, RepoImplTestBase):
         }
         assert_equals(diffs, expected)
 
+    def test_merge_base(self):
+        mr = M.MergeRequest(
+            downstream={
+                'commit_id': '5c47243c8e424136fd5cdd18cd94d34c66d1955c',
+            },
+            source_branch='zz',
+            target_branch='master',
+        )
+        res = self.repo.merge_base(mr)
+        assert_equal(res, '1e146e67985dcd71c74de79613719bef7bddca4a')
+
 
 class TestGitImplementation(unittest.TestCase):
 

http://git-wip-us.apache.org/repos/asf/allura/blob/a96649cd/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index cd410e3..53b4190 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -91,6 +91,10 @@ class Repository(M.Repository):
     def rev_to_commit_id(self, rev):
         return self._impl.rev_parse(rev)
 
+    def merge_base(self, mr):
+        rev = self.latest(branch=mr.target_branch)
+        return rev._id if rev else self.head
+
 
 class SVNCalledProcessError(Exception):