~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_pack_repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-28 22:24:40 UTC
  • mfrom: (4659.1.3 test-speed)
  • Revision ID: pqm@pqm.ubuntu.com-20090828222440-jt2m0uvoy126e5kz
(robertc) Refactor server startup and cleanup registration in the
        test suite to reduce duplication. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
271
271
        # failing to delete obsolete packs is not fatal
272
272
        format = self.get_format()
273
273
        server = fakenfs.FakeNFSServer()
274
 
        server.setUp()
275
 
        self.addCleanup(server.tearDown)
 
274
        self.start_server(server)
276
275
        transport = get_transport(server.get_url())
277
276
        bzrdir = self.get_format().initialize_on_transport(transport)
278
277
        repo = bzrdir.create_repository()
1020
1019
        # Create a smart server that publishes whatever the backing VFS server
1021
1020
        # does.
1022
1021
        self.smart_server = server.SmartTCPServer_for_testing()
1023
 
        self.smart_server.setUp(self.get_server())
1024
 
        self.addCleanup(self.smart_server.tearDown)
 
1022
        self.start_server(self.smart_server, self.get_server())
1025
1023
        # Log all HPSS calls into self.hpss_calls.
1026
1024
        client._SmartClient.hooks.install_named_hook(
1027
1025
            'call', self.capture_hpss_call, None)