/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

  • Committer: John Arbash Meinel
  • Date: 2011-03-23 13:36:31 UTC
  • mto: (5740.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5736.
  • Revision ID: john@arbash-meinel.com-20110323133631-5tb1frfv63ewfw7m
Fix the launchpad-login tests. And fix a bad commit typo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
167
167
        self.assertEquals('http://bazaar.launchpad.net/~apt/apt/devel',
168
168
                          directory._resolve('lp:///apt', factory))
169
169
 
170
 
    def test_rewrite_bzr_ssh_launchpad_net(self):
 
170
    def test_with_login_avoid_resolve_factory(self):
171
171
        # Test that bzr+ssh URLs get rewritten to include the user's
172
172
        # Launchpad ID (assuming we know the Launchpad ID).
173
173
        factory = FakeResolveFactory(
174
174
            self, 'apt', dict(urls=[
175
 
                    'bzr+ssh://bazaar.launchpad.net/~apt/apt/devel',
 
175
                    'bzr+ssh://my-super-custom/special/devel',
176
176
                    'http://bazaar.launchpad.net/~apt/apt/devel']))
177
177
        directory = LaunchpadDirectory()
178
178
        self.assertEquals(
179
 
            'bzr+ssh://bazaar.launchpad.net/~apt/apt/devel',
 
179
            'bzr+ssh://bazaar.launchpad.net/+branch/apt',
180
180
            directory._resolve('lp:///apt', factory, _lp_login='username'))
181
181
 
182
182
    def test_no_rewrite_of_other_bzr_ssh(self):
199
199
    def test_resolve_tilde_to_user(self):
200
200
        factory = FakeResolveFactory(
201
201
            self, '~username/apt/test', dict(urls=[
202
 
                    'bzr+ssh://bazaar.launchpad.net/~username/apt/test']))
 
202
                'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test']))
203
203
        directory = LaunchpadDirectory()
204
204
        self.assertEquals(
205
 
            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
 
205
            'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test',
206
206
            directory._resolve('lp:~/apt/test', factory, _lp_login='username'))
207
207
        # Should also happen when the login is just set by config
208
208
        set_lp_login('username')
209
209
        self.assertEquals(
210
 
            'bzr+ssh://bazaar.launchpad.net/~username/apt/test',
 
210
            'bzr+ssh://bazaar.launchpad.net/+branch/~username/apt/test',
211
211
            directory._resolve('lp:~/apt/test', factory))
212
212
 
213
213
    def test_tilde_fails_no_login(self):