← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 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
1017
1017
        server's urls to be used.
1018
1018
        """
1019
1019
        if backing_server is None:
1020
 
            transport_server.setUp()
 
1020
            transport_server.start_server()
1021
1021
        else:
1022
 
            transport_server.setUp(backing_server)
1023
 
        self.addCleanup(transport_server.tearDown)
 
1022
            transport_server.start_server(backing_server)
 
1023
        self.addCleanup(transport_server.stop_server)
1024
1024
        # Obtain a real transport because if the server supplies a password, it
1025
1025
        # will be hidden from the base on the client side.
1026
1026
        t = get_transport(transport_server.get_url())