← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/chroot.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/chroot.py
65
65
        return self._relpath_from_server_root(relpath)
66
66
 
67
67
 
68
 
class TestingChrootServer(ChrootServer):
69
 
 
70
 
    def __init__(self):
71
 
        """TestingChrootServer is not usable until start_server is called."""
72
 
        ChrootServer.__init__(self, None)
73
 
 
74
 
    def start_server(self, backing_server=None):
75
 
        """Setup the Chroot on backing_server."""
76
 
        if backing_server is not None:
77
 
            self.backing_transport = get_transport(backing_server.get_url())
78
 
        else:
79
 
            self.backing_transport = get_transport('.')
80
 
        ChrootServer.start_server(self)
81
 
 
82
 
 
83
68
def get_test_permutations():
84
69
    """Return the permutations to be used in testing."""
85
 
    return [(ChrootTransport, TestingChrootServer)]
 
70
    from bzrlib.tests import test_server
 
71
    return [(ChrootTransport, test_server.TestingChrootServer)]