Merge lp:~albaguirre/jenkins-launchpad-plugin/support-voting-on-git-mps into lp:jenkins-launchpad-plugin

[Alberto Aguirre]

Support voting on git based MPs

Needs lp_version: devel in the configuration,

Example:
./voteOnMergeProposal.py -r 1 -u http://imgur.com/a/U4KoE -p https://code.launchpad.net/~albaguirre/repowerd/+git/repowerd/+merge/301919

Result:
https://code.launchpad.net/~albaguirre/repowerd/+git/repowerd/+merge/301919/comments/779949

[lp:~albaguirre/jenkins-launchpad-plugin/support-voting-on-git-mps]

133. By Alberto Aguirre on 2016-08-09

merge lp:~albaguirre/jenkins-launchpad-plugin/support-query-git-mps, fix conflict

134. By Alberto Aguirre on 2016-08-09

Slight cleanup, more tests

135. By Alberto Aguirre on 2016-08-12

Require bazaar instead of bzr for repo_type.

136. By Alberto Aguirre on 2016-08-12

Fix TestGetBranchHandle tests

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'jlp/commands/getMergeProposals.py'
--- jlp/commands/getMergeProposals.py	2016-08-12 16:51:26 +0000
+++ jlp/commands/getMergeProposals.py	2016-08-12 16:51:26 +0000
@@ -35,8 +35,8 @@
                             "proposals.")
     parser.add_argument("-t", "--merge_type", default="Approved",
                         help="Count only this type of merge proposals.")
-    parser.add_argument("-r", "--repo_type", default="bzr",
-                        help="Repository type [bzr or git]")
+    parser.add_argument("-r", "--repo_type", default="bazaar",
+                        help="Repository type [bazaar or git]")
     parser.add_argument("branch", nargs="+",
                         help="Branch to check merge count.")
     args = vars(parser.parse_args())

=== modified file 'jlp/launchpadutils.py'
--- jlp/launchpadutils.py	2016-08-12 16:51:26 +0000
+++ jlp/launchpadutils.py	2016-08-12 16:51:26 +0000
@@ -20,10 +20,19 @@
     This returns what seems to be the launchpad way of doing subjects.
     :param  mp: launchpad merge proposal handle
     """
+    if '+git' in mp.web_link:
+        source = mp.source_git_repository.display_name.replace('lp:', '') + \
+                ':' + \
+                mp.source_git_path.replace('refs/heads/', '')
+        target = mp.target_git_repository.display_name.replace('lp:', '') + \
+                ':' + \
+                mp.target_git_path.replace('refs/heads/', '')
 
-    return 'Re: [Merge] {} into {}'.format(
-        mp.source_branch.display_name,
-        mp.target_branch.display_name)
+        return 'Re: [Merge] {} into {}'.format(source, target)
+    else:
+        return 'Re: [Merge] {} into {}'.format(
+            mp.source_branch.display_name,
+            mp.target_branch.display_name)
 
 
 def get_branch_from_mp(merge_proposal):
@@ -306,7 +315,7 @@
 def approve_mp(mp, revision, build_url):
     """Approve a given merge proposal a revision.
 
-    :params mp: launchapd handle to the respective merge proposal
+    :params mp: launchpad handle to the respective merge proposal
     :params revision: revision that should be approved
     :params build_url: jenkins build url with the details. This job is used to
                        generate the message with all the links to test runs as
@@ -324,7 +333,7 @@
 def disapprove_mp(mp, revision, build_url, reason=None):
     """Disapprove a given merge proposal a revision (vote Needs Fixing).
 
-    :params mp: launchapd handle to the respective merge proposal
+    :params mp: launchpad handle to the respective merge proposal
     :params revision: revision that should be fixed
     :params build_url: jenkins build url with the details. This job is used to
                        generate the message with all the links to test runs as
@@ -401,7 +410,7 @@
     :param repo_type: Type of repository [bzr or git]
     """
 
-    if 'bzr' == repo_type:
+    if 'bazaar' == repo_type:
         return lp_handle.branches.getByUrl(url=name)
     elif 'git' == repo_type:
         name = name.replace('lp:', '');
@@ -414,7 +423,7 @@
         logger.debug('Repo type "' + repo_type + '" is not valid')
         return None
 
-def get_merge_proposals(lp_handle, name, state, repo_type='bzr'):
+def get_merge_proposals(lp_handle, name, state, repo_type='bazaar'):
     """ Return all merge proposals for a given branch.
 
     Returns a list of launchpad handles for merge proposals.
@@ -436,6 +445,26 @@
             mps.append(mp)
     return mps
 
+def get_branch_handle_from_url(lp_handle, url):
+    """ Return a branch/repo handle for the given url.
+
+    Returns a launchpad branch or git repository handle for the given url.
+    :param lp_handle: launchpad API handle/instance
+    :param url: url of the branch or git repository
+    """
+    if '+git' in url:
+        name = url.replace('https://code.launchpad.net/', '')
+        logger.debug('fetching repo: ' + name)
+        try:
+           return lp_handle.git_repositories.getByPath(path=name)
+        except AttributeError:
+            logger.debug('git_repositories.getByPath was not found. You may need to set lp_version=devel in the config')
+            return None
+    else:
+        name = url.replace('https://code.launchpad.net/', 'lp:')
+        name = name.replace('https://code.staging.launchpad.net/', 'lp://staging/')
+        logger.debug('fetching branch: ' + name)
+        return lp_handle.branches.getByUrl(url=name)
 
 def get_mp_handle_from_url(lp_handle, merge_proposal_link):
     """ Get launchpad handle for merge proposal given a merge proposal URL.
@@ -448,11 +477,7 @@
         logger.error('Unable to get branch link from merge proposal link.')
         return None
 
-    branch_link = branch_link.replace('https://code.launchpad.net/', 'lp:')
-    branch_link = branch_link.replace('https://code.staging.launchpad.net/',
-                                      'lp://staging/')
-    logger.debug('fetching branch: ' + branch_link)
-    branch = lp_handle.branches.getByUrl(url=branch_link)
+    branch = get_branch_handle_from_url(lp_handle, branch_link)
     if not branch:
         logger.debug('Branch {} does not exist'.format(branch_link))
         return None

=== modified file 'tests/test_launchpadutils.py'
--- tests/test_launchpadutils.py	2016-08-12 16:51:26 +0000
+++ tests/test_launchpadutils.py	2016-08-12 16:51:26 +0000
@@ -459,10 +459,29 @@
         mp.source_branch.display_name = 'lp:~ps-jenkins/unity/fix'
         return mp
 
+    def _get_git_mp(self):
+        mp = MagicMock()
+        mp.web_link = 'https://code.launchpad.net/~dummy/agitproject/+git/gitproject/+merge/778899'
+        mp.target_git_repository.display_name = 'lp:agitproject'
+        mp.source_git_repository.display_name = 'lp:~auser/gitrepo'
+        mp.source_git_path = 'refs/heads/abranch'
+        mp.target_git_path = 'refs/heads/master'
+        return mp
+
     def _get_subject(self, mp):
         return 'Re: [Merge] {} into {}'.format(
             mp.source_branch.display_name, mp.target_branch.display_name)
 
+    def _expected_git_mp_subject(self, mp):
+        source = mp.source_git_repository.display_name.replace('lp:', '') + \
+                 ':' + \
+                 mp.source_git_path.replace('refs/heads/', '')
+        target = mp.target_git_repository.display_name.replace('lp:', '') + \
+                 ':' + \
+                 mp.target_git_path.replace('refs/heads/', '')
+
+        return 'Re: [Merge] {} into {}'.format(source, target)
+
     def setUp(self):
         user = MagicMock()
         user.name = self.jenkinsUserName
@@ -531,6 +550,40 @@
             subject=subject,
             content=content)
 
+    def test_approve_git_mp(self):
+        mp = self._get_git_mp()
+        subject = self._expected_git_mp_subject(mp)
+        launchpadutils.approve_mp(mp, '1', 'http://url')
+        content = dedent('''\
+                            PASSED: Continuous integration, rev:1
+                            http://url
+
+                            Click here to trigger a rebuild:
+                            http://url/rebuild
+                            ''')
+        mp.createComment.assert_called_once_with(
+            review_type=get_config_option('launchpad_review_type'),
+            vote=launchpadutils.LaunchpadVote.APPROVE,
+            subject=subject,
+            content=content)
+
+    def test_dissaprove_git_mp(self):
+        mp = self._get_git_mp()
+        subject = self._expected_git_mp_subject(mp)
+        launchpadutils.disapprove_mp(mp, '1', 'http://url')
+        content = dedent('''\
+                            FAILED: Continuous integration, rev:1
+                            http://url
+
+                            Click here to trigger a rebuild:
+                            http://url/rebuild
+                            ''')
+        mp.createComment.assert_called_once_with(
+            review_type=get_config_option('launchpad_review_type'),
+            vote=launchpadutils.LaunchpadVote.NEEDS_FIXING,
+            subject=subject,
+            content=content)
+
 
 class TestGetMergeProposalsWithInvalidBranch(unittest.TestCase):
     branch_with_mps = None
@@ -646,29 +699,76 @@
         ret = launchpadutils.get_mp_handle_from_url(launchpad, mp_url)
         self.assertEquals(ret, mp)
 
+    def test_call_git_api_for_git_url(self):
+        """If there is a merge proposal for the given merge proposal URL then
+        get_mp_handle_from_url must return the respective merge proposal
+        handle"""
+
+        mp_url = 'https://code.launchpad.net/~dummy/agitproject/+git/gitproject/+merge/778899'
+        launchpad = MagicMock()
+        git_repo = MagicMock
+        mp = MagicMock()
+        mp.web_link = mp_url
+        git_repo.landing_targets = [mp]
+        launchpad.git_repositories.getByPath = lambda path: git_repo
+        ret = launchpadutils.get_mp_handle_from_url(launchpad, mp_url)
+        self.assertEquals(ret, mp)
+
 class TestGetBranchHandle(unittest.TestCase):
+    def create_mock_which_returns(self, return_value):
+        a_mock = MagicMock()
+        a_mock.return_value = return_value
+        return a_mock
+
+    def create_mock_launchpad_for_git(self, handle_to_return):
+        launchpad = MagicMock()
+        launchpad.git_repositories.getByPath = self.create_mock_which_returns(handle_to_return)
+        return launchpad
+
+    def create_mock_launchpad_for_bzr(self, handle_to_return):
+        launchpad = MagicMock()
+        launchpad.branches.getByUrl = self.create_mock_which_returns(handle_to_return)
+        return launchpad
+
     def test_uses_bzr_api_for_bzr_type(self):
-        launchpad = MagicMock()
+        expected_handle = MagicMock()
+        launchpad = self.create_mock_launchpad_for_bzr(expected_handle)
         name = 'lp:dummy'
-        getByUrlMock = MagicMock()
-        dummyHandle = MagicMock()
-        getByUrlMock.return_value = dummyHandle
-        launchpad.branches.getByUrl = getByUrlMock
 
-        result = launchpadutils.get_branch_handle_for(launchpad, name, 'bzr');
+        result = launchpadutils.get_branch_handle_for(launchpad, name, 'bazaar');
 
         launchpad.branches.getByUrl.assert_called_once_with(url=name)
-        self.assertEqual(result, dummyHandle)
+        self.assertEqual(result, expected_handle)
 
     def test_uses_git_api_for_git_type(self):
-        launchpad = MagicMock()
-        name = 'lp:dummy'
-        getByPathMock = MagicMock()
-        dummyHandle = MagicMock()
-        getByPathMock.return_value = dummyHandle
-        launchpad.git_repositories.getByPath = getByPathMock
+        expected_handle = MagicMock()
+        launchpad = self.create_mock_launchpad_for_git(expected_handle)
+        name = "lp:dummy"
 
         result = launchpadutils.get_branch_handle_for(launchpad, name, 'git');
 
         launchpad.git_repositories.getByPath.assert_called_once_with(path='dummy')
-        self.assertEqual(result, dummyHandle)
\ No newline at end of file
+        self.assertEqual(result, expected_handle)
+
+    def test_uses_bzr_api_for_bzr_url(self):
+        expected_handle = MagicMock()
+        launchpad = self.create_mock_launchpad_for_bzr(expected_handle)
+        expected_path = '~auser/plainoldbzrproject/abranch'
+        url = 'https://code.launchpad.net/' + expected_path
+        expected_url = "lp:" + expected_path
+
+        result = launchpadutils.get_branch_handle_from_url(launchpad, url)
+
+        launchpad.branches.getByUrl.assert_called_once_with(url=expected_url)
+        self.assertEqual(result, expected_handle)
+
+    def test_uses_git_api_for_git_url(self):
+        expected_handle = MagicMock()
+        launchpad = self.create_mock_launchpad_for_git(expected_handle)
+        expected_path='~auser/agitproject/+git/agitproject'
+        url = 'https://code.launchpad.net/' + expected_path
+
+        result = launchpadutils.get_branch_handle_from_url(launchpad, url)
+
+        launchpad.git_repositories.getByPath.assert_called_once_with(path=expected_path)
+        self.assertEqual(result, expected_handle)
\ No newline at end of file