← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

  • Committer: Martin Pool
  • Date: 2010-01-06 04:48:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4943.
  • Revision ID: mbp@sourcefrog.net-20100106044859-s8gwd12nev9p7nws
Rename Server.tearDown to .stop_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
434
434
        try:
435
435
            self.assertTrue(server.scheme in _get_protocol_handlers().keys())
436
436
        finally:
437
 
            server.tearDown()
 
437
            server.stop_server()
438
438
 
439
 
    def test_tearDown(self):
 
439
    def test_stop_server(self):
440
440
        backing_transport = MemoryTransport()
441
441
        server = ChrootServer(backing_transport)
442
442
        server.setUp()
443
 
        server.tearDown()
 
443
        server.stop_server()
444
444
        self.assertFalse(server.scheme in _get_protocol_handlers().keys())
445
445
 
446
446
    def test_get_url(self):
450
450
        try:
451
451
            self.assertEqual('chroot-%d:///' % id(server), server.get_url())
452
452
        finally:
453
 
            server.tearDown()
 
453
            server.stop_server()
454
454
 
455
455
 
456
456
class PathFilteringDecoratorTransportTest(TestCase):
466
466
 
467
467
        subdir_transport = transport.clone('subdir')
468
468
        self.assertEqual(server.get_url(), subdir_transport.abspath('/'))
469
 
        server.tearDown()
 
469
        server.stop_server()
470
470
 
471
471
    def make_pf_transport(self, filter_func=None):
472
472
        """Make a PathFilteringTransport backed by a MemoryTransport.
478
478
        server = PathFilteringServer(
479
479
            get_transport('memory:///foo/bar/'), filter_func)
480
480
        server.setUp()
481
 
        self.addCleanup(server.tearDown)
 
481
        self.addCleanup(server.stop_server)
482
482
        return get_transport(server.get_url())
483
483
 
484
484
    def test__filter(self):