Merge lp:~powersj/jenkins-launchpad-plugin/support-lp-trigger-for-git-mps into lp:jenkins-launchpad-plugin

[Joshua Powers]

Merge master and ~albaguirre's proposal for triggering git reviews, as well as voting on them, and modified to not require a repo_type be passed in, but optionally added

Ran included tests:

Ran 298 tests in 0.638s
OK

Command tested with:

./launchpadTrigger.py --lock-name='my_lock' --job='my_ci_job' --branch=lp:cloud-init --trigger-ci
DEBUG: Going to acquire launchpad lock "launchpad-trigger-lock-my_lock" for launchpadTrigger
DEBUG: Lock acquired for launchpadTrigger
DEBUG: Using "/home/powersj/.launchpadlib-my_lock" as launchpadlib cache directory.
DEBUG: Provided branch name: lp:cloud-init
DEBUG: Using repo_type: auto
DEBUG: git repo: https://api.launchpad.net/devel/~cloud-init-dev/cloud-init/+git/cloud-init
DEBUG: Users "raharper" not allowed to trigger jobs
DEBUG: Users "slystopad" not allowed to trigger jobs

./launchpadTrigger.py --lock-name='my_lock' --job='my_ci_job' --branch=lp:curtin --trigger-ci
DEBUG: Going to acquire launchpad lock "launchpad-trigger-lock-my_lock" for launchpadTrigger
DEBUG: Lock acquired for launchpadTrigger
DEBUG: Using "/home/powersj/.launchpadlib-my_lock" as launchpadlib cache directory.
DEBUG: Provided branch name: lp:curtin
DEBUG: Using repo_type: auto
DEBUG: bazaar repo: https://api.launchpad.net/devel/~curtin-dev/curtin/trunk
DEBUG: Users "raharper" not allowed to trigger jobs
DEBUG: Users "pwlars" not allowed to trigger jobs

Voting tested with:
./voteOnMergeProposal.py -s "PASSED" -u "https://jenkins.ubuntu.com/server" -r "8d9f243dc678698f9aea16b3e43dcdf75176ee0b" -b "~powersj/cloud-init:jlp" -p "https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152"
DEBUG: fetching repo: ~powersj/cloud-init/+git/cloud-init/
DEBUG: mp_link: https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152.
DEBUG: mp.web_link: https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152
DEBUG: Unable to get job name from build_url.Skipping check for empty commit message
DEBUG: PASSED: Continuous integration, rev:8d9f243dc678698f9aea16b3e43dcdf75176ee0b

./voteOnMergeProposal.py -s "FAILED" -u "https://jenkins.ubuntu.com/server" -r "8d9f243dc678698f9aea16b3e43dcdf75176ee0b" -b "~powersj/cloud-init:jlp" -p "https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152"
DEBUG: fetching repo: ~powersj/cloud-init/+git/cloud-init/
DEBUG: mp_link: https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152.
DEBUG: mp.web_link: https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152
DEBUG: Unable to get job name from build_url.Skipping check for empty commit message
DEBUG: FAILED: Continuous integration, rev:8d9f243dc678698f9aea16b3e43dcdf75176ee0b

The result of the voting can be seen on this cloud-init git MP:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/318152

[Francis Ginther (fginther)]

Looks really good. Just one default parameter value I'd like to see changed.

Thanks again for working on these changes.

review: Needs Fixing

[lp:~powersj/jenkins-launchpad-plugin/support-lp-trigger-for-git-mps]

135. By Joshua Powers on 2017-02-24

Updating default arg to auto and updating tests to match change

[Joshua Powers (powersj)]

Good catch on the default parameter. Updated that to auto and the tests.

review: Needs Resubmitting

[Francis Ginther (fginther)]

Thanks for the update, approve.

review: Approve

=== modified file 'jlp/commands/launchpadTrigger.py'
--- jlp/commands/launchpadTrigger.py	2013-05-10 14:10:52 +0000
+++ jlp/commands/launchpadTrigger.py	2017-02-24 14:36:30 +0000
@@ -8,20 +8,20 @@
 LAUNCHPADLIB_DIR_PREFIX = os.path.expanduser('~/.launchpadlib')
 
 
-def trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir):
+def trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir, repo_type):
     """Trigger a CI build."""
 
     launchpad = get_launchpad(launchpadlib_dir)
-    mps = get_merge_proposals(launchpad, branch, ['Needs review'])
+    mps = get_merge_proposals(launchpad, branch, ['Needs review'], repo_type)
     jenkinsutils.trigger_ci_build(launchpad, mps, job, jenkins_url)
 
 
 def trigger_al_build(branch, job, jenkins_url, fasttrack_merge,
-                     launchpadlib_dir):
+                     launchpadlib_dir, repo_type):
     """Trigger an autolanding build."""
 
     launchpad = get_launchpad(launchpadlib_dir)
-    mps = get_merge_proposals(launchpad, branch, ['Approved'])
+    mps = get_merge_proposals(launchpad, branch, ['Approved'], repo_type)
     jenkinsutils.trigger_al_build(launchpad, mps, job, jenkins_url,
                                   fasttrack_merge)
 
@@ -32,7 +32,8 @@
                     job=None,
                     jenkins_url=None,
                     fasttrack_merge=False,
-                    lock_name=''):
+                    lock_name='',
+                    repo_type='auto'):
     """Trigger a Jenkins build."""
 
     if jenkins_url is None:
@@ -43,10 +44,10 @@
         launchpadlib_dir))
 
     if trigger_ci:
-        trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir)
+        trigger_ci_build(branch, job, jenkins_url, launchpadlib_dir, repo_type)
     elif autoland:
         trigger_al_build(branch, job, jenkins_url, fasttrack_merge,
-                         launchpadlib_dir)
+                         launchpadlib_dir, repo_type)
     return 1
 
 
@@ -75,6 +76,8 @@
                         default='launchpadTrigger',
                         help='''Name of the lock and launchpadlib cache
                         to be used''')
+    parser.add_argument("-r", "--repo_type", default="auto",
+                        help="Repository type [bazaar, git, or auto]")
 
     args = vars(parser.parse_args())
 

=== modified file 'jlp/jenkinsutils.py'
--- jlp/jenkinsutils.py	2016-02-05 13:20:38 +0000
+++ jlp/jenkinsutils.py	2017-02-24 14:36:30 +0000
@@ -670,6 +670,16 @@
     params['hooks'] = get_parameter(jenkins, job_url, 'dput_hooks', '')
     params['test_result'] = "PASSED"
 
+def get_jenkins_params(mp):
+    params = {
+        'landing_candidate': launchpadutils.get_source_repo(mp),
+        'merge_proposal': mp.web_link,
+        'candidate_revision': launchpadutils.get_latest_revision(mp)}
+
+    if '+git' in mp.web_link:
+        params['landing_candidate_branch'] = launchpadutils.get_source_branch(mp)
+
+    return params
 
 def start_jenkins_job(lp_handle, launchpaduser, jenkins_url, jenkins_job, mp,
                       fasttrack_merge=False):
@@ -686,10 +696,8 @@
     """
     j = jenkins.Jenkins(jenkins_url, get_config_option('jenkins_user'),
                         get_config_option('jenkins_password'))
-    jenkins_params = {
-        'landing_candidate': mp.source_branch.bzr_identity,
-        'merge_proposal': mp.web_link,
-        'candidate_revision': mp.source_branch.revision_count}
+
+    jenkins_params = get_jenkins_params(mp)
 
     job_info = j.get_job_info(jenkins_job)
     if not job_info['buildable']:

=== modified file 'jlp/launchpadutils.py'
--- jlp/launchpadutils.py	2017-02-16 21:32:04 +0000
+++ jlp/launchpadutils.py	2017-02-24 14:36:30 +0000
@@ -9,6 +9,23 @@
     DISAPPROVE = 'Disapprove'
     NEEDS_FIXING = 'Needs Fixing'
 
+def get_source_repo(mp):
+    if '+git' in mp.web_link:
+        return mp.source_git_repository.git_identity
+    else:
+        return mp.target_branch.bzr_identity
+
+def get_source_branch(mp):
+    if '+git' in mp.web_link:
+        return mp.source_git_path.replace('refs/heads/', '')
+    else:
+        return mp.source_branch.bzr_identity
+
+def get_target_branch(mp):
+    if '+git' in mp.web_link:
+        return mp.target_git_path.replace('refs/heads/', '')
+    else:
+        return mp.target_branch.bzr_identity
 
 def get_vote_subject(mp):
     """Given a mp handle return a subject for the vote message
@@ -20,10 +37,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):
@@ -262,6 +288,11 @@
         return True
     return False
 
+def get_review_revision_regex(mp):
+    if '+git' in mp.web_link:
+        return '^(PASSED|FAILED): Continuous integration, rev:([0-9a-f]+)'
+    else:
+        return '^(PASSED|FAILED): Continuous integration, rev:(\d+)'
 
 def get_latest_review(launchpad_user, mp):
     """Return the latest revision reviewed by the given launchpad_user.
@@ -278,12 +309,25 @@
         if comment.author.name == launchpad_user.name:
             if comment.vote_tag == launchpad_review_type:
                 m = re.search(
-                    '^(PASSED|FAILED): Continuous integration, rev:(\d+)',
+                    get_review_revision_regex(mp),
                     comment.message_body)
-                if m and (int(m.group(2)) > revision):
-                    revision = int(m.group(2))
+                if m:
+                    revision = m.group(2)
     return revision
 
+def get_latest_revision(mp):
+    """Return the latest revision of the given merge proposal.
+
+    :param mp: handle to merge proposal
+    """
+    if '+git' in mp.web_link:
+        for ref in mp.source_git_repository.refs_collection:
+            if ref.path == mp.source_git_path:
+                return ref.commit_sha1
+        return str(0)
+    else:
+        return mp.source_branch.revision_count
+
 
 def latest_candidate_validated(launchpad_user, mp):
     """Return if the latest candidate revision of the merge proposal is
@@ -296,9 +340,11 @@
 
     latest_review = get_latest_review(launchpad_user, mp)
     logger.debug('Latest_review is revision: ' + str(latest_review))
-    if latest_review >= mp.source_branch.revision_count:
+    latest_revision = get_latest_revision(mp)
+    logger.debug('Latest revision is: ' + str(latest_revision))
+    if latest_review == latest_revision:
         logger.debug('Skipping this MP. Current revision: ' +
-                     str(mp.source_branch.revision_count))
+                     str(latest_revision))
         return True
     return False
 
@@ -306,7 +352,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 +370,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
@@ -462,6 +508,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.
@@ -474,11 +540,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_launchpadTrigger.py'
--- tests/test_launchpadTrigger.py	2017-02-18 13:28:31 +0000
+++ tests/test_launchpadTrigger.py	2017-02-24 14:36:30 +0000
@@ -142,6 +142,27 @@
                                                 'http://localhost:8080/')
 
 
+    def test_trigger_git_ci(self):
+        """Trigger CI got a git repo."""
+
+        sys_argv = ["launchpadTrigger.py",
+                    "--branch=lp:faux-dbus-test-runner",
+                    "--trigger-ci",
+                    "--job=faux-dbus-test-runner",
+                    "--repo_type=git"]
+        with patch('sys.argv', sys_argv), \
+             patch('jlp.commands.launchpadTrigger.get_merge_proposals') as \
+                get_merge_proposals, \
+                patch('jlp.commands.launchpadTrigger.jenkinsutils.' +
+                              'trigger_ci_build') as trigger_ci_build:
+            get_merge_proposals.return_value = [self.merge_proposal]
+            launchpadTrigger()
+            get_merge_proposals.assert_called_with(self.launchpad,
+                                                   'lp:faux-dbus-test-runner',
+                                                   ['Needs review'],
+                                                   'git')
+
+
 class TestLockNames(PatchedLaunchpadTriggerTest):
 
     sys_argv = ["launchpadTrigger.py",
@@ -196,7 +217,7 @@
                             lock_name=self.lock_name)
             trigger_ci_build.assert_called_with(
                 None, None, get_config_option('jenkins_url'),
-                self.expected_cache_dir)
+                self.expected_cache_dir, 'auto')
 
     def test_lock_name_autolanding(self):
         """test trigger_jenkins method for correct use of lock_name param"""
@@ -208,4 +229,17 @@
                             lock_name=self.lock_name)
             trigger_al_build.assert_called_with(
                 None, None, get_config_option('jenkins_url'),
-                False, self.expected_cache_dir)
+                False, self.expected_cache_dir, 'auto')
+
+    def test_repo_type_is_propagated(self):
+        """test trigger_jenkins method for correct use of lock_name param"""
+
+        with patch('jlp.commands.launchpadTrigger.trigger_al_build') \
+                as trigger_al_build:
+            trigger_jenkins(branch=None,
+                            autoland=True,
+                            lock_name=self.lock_name,
+                            repo_type='git')
+            trigger_al_build.assert_called_with(
+                None, None, get_config_option('jenkins_url'),
+                False, self.expected_cache_dir, 'git')

=== modified file 'tests/test_launchpadutils.py'
--- tests/test_launchpadutils.py	2017-02-19 03:05:45 +0000
+++ tests/test_launchpadutils.py	2017-02-24 14:36:30 +0000
@@ -411,7 +411,7 @@
                                "URL:..."
         mp.all_comments = [comment]
         self.assertEqual(
-            launchpadutils.get_latest_review(self.launchpad_user, mp), 47)
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '47')
 
     def test_get_latest_review_which_failed(self):
         mp = MagicMock()
@@ -422,7 +422,7 @@
                                "URL:..."
         mp.all_comments = [comment]
         self.assertEqual(
-            launchpadutils.get_latest_review(self.launchpad_user, mp), 47)
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '47')
 
     @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: 60)
     def test_new_mp_candidate_revision_in_queue(self):
@@ -448,6 +448,77 @@
                 self.launchpad_user, mp)
             self.assertTrue(ret)
 
+class TestLatestReviewForGitMPs(unittest.TestCase):
+    def setUp(self):
+        self.launchpad_user = MagicMock()
+        self.jenkinsUserName = 'name'
+        self.launchpad_user.name = self.jenkinsUserName
+
+    def create_mp(self):
+        mp = MagicMock()
+        mp.web_link = 'https://code.launchpad.net/~user/project/+git/project/+merge/777'
+        return mp
+
+    def create_mp_with_revision(self, revision):
+        mp = self.create_mp()
+        path = "refs/heads/nice"
+        ref = MagicMock()
+        ref.path = path
+        ref.commit_sha1 = revision
+        mp.source_git_path = path
+        mp.source_git_repository.refs_collection = [ref]
+        return mp
+
+    def test_get_latest_review_no_comments(self):
+        mp = self.create_mp()
+        mp.all_comments = []
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), 0)
+
+    def test_get_latest_review_unrelated_comment(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = 'unrelated comment'
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), 0)
+
+    def test_get_latest_review_which_passed(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.author.name = self.jenkinsUserName
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = "PASSED: Continuous integration, rev:2fd4e1c67a2d28fced849ee1bb76e7391b93eb12\n" + \
+                               "URL:..."
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+
+    def test_get_latest_review_which_failed(self):
+        mp = self.create_mp()
+        comment = MagicMock()
+        comment.author.name = self.jenkinsUserName
+        comment.vote_tag = get_config_option('launchpad_review_type')
+        comment.message_body = "FAILED: Continuous integration, rev:2fd4e1c67a2d28fced849ee1bb76e7391b93eb12\n" + \
+                               "URL:..."
+        mp.all_comments = [comment]
+        self.assertEqual(
+            launchpadutils.get_latest_review(self.launchpad_user, mp), '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+
+    @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+    def test_new_mp_candidate_revision_in_queue(self):
+        mp = self.create_mp_with_revision('de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3')
+        ret = launchpadutils.latest_candidate_validated(
+            self.launchpad_user, mp)
+        self.assertFalse(ret)
+
+    @patch('jlp.launchpadutils.get_latest_review', new=lambda x, y: '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+    def test_mp_already_validated(self):
+        mp = self.create_mp_with_revision('2fd4e1c67a2d28fced849ee1bb76e7391b93eb12')
+        ret = launchpadutils.latest_candidate_validated(
+            self.launchpad_user, mp)
+        self.assertTrue(ret)
 
 class TestApproveAndDisapprove(unittest.TestCase):
     jenkinsUserName = 'jenkins-user'
@@ -459,10 +530,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 +621,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
@@ -649,6 +773,21 @@
         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 setUp(self):
         '''Setup an empty launchpad.'''
@@ -775,4 +914,3 @@
         with self.assertRaises(RuntimeError):
             launchpadutils.get_branch_handle_for(self.launchpad, name,
                                                  'auto');
-