← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/chroot.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/chroot.py
19
19
"""
20
20
 
21
21
from bzrlib.transport import (
 
22
    get_transport,
22
23
    pathfilter,
23
24
    register_transport,
 
25
    Server,
 
26
    Transport,
 
27
    unregister_transport,
24
28
    )
25
29
 
26
30
 
61
65
        return self._relpath_from_server_root(relpath)
62
66
 
63
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
 
64
83
def get_test_permutations():
65
84
    """Return the permutations to be used in testing."""
66
 
    from bzrlib.tests import test_server
67
 
    return [(ChrootTransport, test_server.TestingChrootServer)]
 
85
    return [(ChrootTransport, TestingChrootServer)]