← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for directory lookup through Launchpad.net"""
18
18
 
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=[