~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/test_lp_service.py

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
        web_url = service.get_web_url_from_branch_url(
98
98
            'bzr+ssh://bazaar.launchpad.net/~foo/bar/baz')
99
99
        self.assertEqual(
100
 
            'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
 
100
            'https://code.launchpad.net/~foo/bar/baz', web_url)
101
101
 
102
102
    def test_product_bzr_ssh_url(self):
103
103
        service = LaunchpadService(lp_instance='production')
152
152
            dict(urls=['http://bazaar.launchpad.net/~foo/bar/baz']))
153
153
        web_url = service.get_web_url_from_branch_url('lp:foo', factory)
154
154
        self.assertEqual(
155
 
            'https://code.edge.launchpad.net/~foo/bar/baz', web_url)
 
155
            'https://code.launchpad.net/~foo/bar/baz', web_url)
156
156
 
157
157
    def test_lp_branch_fault(self):
158
158
        service = LaunchpadService()