← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
121
121
        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu',
122
122
                           'lp:ubuntu')
123
123
 
 
124
    def test_ubuntu_invalid(self):
 
125
        """Invalid ubuntu urls don't crash.
 
126
 
 
127
        :seealso: http://pad.lv/843900
 
128
        """
 
129
        # This ought to be natty-updates.
 
130
        self.assertRaises(errors.InvalidURL,
 
131
            self.assertResolve,
 
132
            '',
 
133
            'ubuntu:natty/updates/smartpm')
 
134
 
124
135
    def test_ubuntu_apt(self):
125
136
        self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/apt',
126
137
                           'lp:ubuntu/apt')