~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
153
153
            directory._resolve('lp:///apt', factory, _lp_login='username'))
154
154
 
155
155
    def test_no_rewrite_of_other_bzr_ssh(self):
156
 
        # Test that we don't rewrite bzr+ssh URLs for other 
 
156
        # Test that we don't rewrite bzr+ssh URLs for other
157
157
        self.assertEqual(None, get_lp_login())
158
158
        factory = FakeResolveFactory(
159
159
            self, 'apt', dict(urls=[