/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

(jameinel) Fix bug #397739,
 resolve 'lp:foo' locally as long as we have a launchpad-login to use
 bzr+ssh. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
180
180
        self.assertEquals('http://bazaar.launchpad.net/~apt/apt/devel',
181
181
                          directory._resolve('lp:///apt', factory))
182
182
 
183
 
    def test_rewrite_bzr_ssh_launchpad_net(self):
 
183
    def test_with_login_avoid_resolve_factory(self):
184
184
        # Test that bzr+ssh URLs get rewritten to include the user's
185
185
        # Launchpad ID (assuming we know the Launchpad ID).
186
186
        factory = FakeResolveFactory(
187
187
            self, 'apt', dict(urls=[
188
 
                    'bzr+ssh://bazaar.launchpad.net/~apt/apt/devel',
 
188
                    'bzr+ssh://my-super-custom/special/devel',
189
189
                    'http://bazaar.launchpad.net/~apt/apt/devel']))
190
190
        directory = LaunchpadDirectory()
191
191
        self.assertEquals(
192
 
            'bzr+ssh://bazaar.launchpad.net/~apt/apt/devel',
 
192
            'bzr+ssh://bazaar.launchpad.net/+branch/apt',
193
193
            directory._resolve('lp:///apt', factory, _lp_login='username'))
194
194
 
195
195
    def test_no_rewrite_of_other_bzr_ssh(self):
212
212
    def test_resolve_tilde_to_user(self):
213
213
        factory = FakeResolveFactory(
214
214
            self, '~username/apt/test', dict(urls=[
215
 
                    'bzr+ssh://bazaar.launchpad.net/~username/apt/test']))
 
215
                'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test']))
216
216
        directory = LaunchpadDirectory()
217
217
        self.assertEquals(
218
 
            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
 
218
            'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test',
219
219
            directory._resolve('lp:~/apt/test', factory, _lp_login='username'))
220
220
        # Should also happen when the login is just set by config
221
221
        set_lp_login('username')
222
222
        self.assertEquals(
223
 
            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
 
223
            'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test',
224
224
            directory._resolve('lp:~/apt/test', factory))
225
225
 
226
226
    def test_tilde_fails_no_login(self):