← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_service.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 selection of the right Launchpad service by environment"""
18
18
 
126
126
            NotLaunchpadBranch, service.get_web_url_from_branch_url,
127
127
            'bzr+ssh://example.com/~foo/bar/baz')
128
128
        self.assertEqual(
129
 
            'bzr+ssh://example.com/~foo/bar/baz is not hosted on Launchpad.',
 
129
            'bzr+ssh://example.com/~foo/bar/baz is not registered on Launchpad.',
130
130
            str(error))
131
131
 
132
132
    def test_dodgy_launchpad_url(self):