/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: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
1
 
# Copyright (C) 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
216
216
        directories.remove('lp:')
217
217
        directories.register('lp:', FooService, 'Map lp URLs to local urls')
218
218
        self.addCleanup(_register_directory)
219
 
        self.addCleanup(lambda: directories.remove('lp:'))
 
219
        self.addCleanup(directories.remove, 'lp:')
220
220
        transport = get_transport('lp:///apt')
221
221
        branch = Branch.open_from_transport(transport)
222
222
        self.assertEqual(target_branch.base, branch.base)
274
274
    def setUp(self):
275
275
        tests.TestCase.setUp(self)
276
276
        self.server = self.server_class()
277
 
        self.server.setUp()
 
277
        self.server.start_server()
278
278
        # Ensure we don't clobber env
279
279
        self._captureVar('BZR_LP_XMLRPC_URL', None)
280
280
 
281
281
    def tearDown(self):
282
 
        self.server.tearDown()
 
282
        self.server.stop_server()
283
283
        tests.TestCase.tearDown(self)
284
284
 
285
285
    def set_canned_response(self, server, path):