← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/pathfilter.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/pathfilter.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 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
59
59
    def get_url(self):
60
60
        return self.scheme
61
61
 
62
 
    def setUp(self):
 
62
    def start_server(self):
63
63
        self.scheme = 'filtered-%d:///' % id(self)
64
64
        register_transport(self.scheme, self._factory)
65
65
 
66
 
    def tearDown(self):
 
66
    def stop_server(self):
67
67
        unregister_transport(self.scheme, self._factory)
68
68
 
69
69
 
177
177
class TestingPathFilteringServer(PathFilteringServer):
178
178
 
179
179
    def __init__(self):
180
 
        """TestingChrootServer is not usable until setUp is called."""
 
180
        """TestingChrootServer is not usable until start_server is called."""
181
181
 
182
 
    def setUp(self, backing_server=None):
 
182
    def start_server(self, backing_server=None):
183
183
        """Setup the Chroot on backing_server."""
184
184
        if backing_server is not None:
185
185
            self.backing_transport = get_transport(backing_server.get_url())
187
187
            self.backing_transport = get_transport('.')
188
188
        self.backing_transport.clone('added-by-filter').ensure_base()
189
189
        self.filter_func = lambda x: 'added-by-filter/' + x
190
 
        PathFilteringServer.setUp(self)
 
190
        PathFilteringServer.start_server(self)
191
191
 
192
192
 
193
193
def get_test_permutations():