/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/treebuilder.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-12 14:29:32 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061012142932-7221fe16d2b48fa3
Shuffle http related test code. Hopefully it ends up at the right place :)

* bzrlib/tests/HttpServer.py: 
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).

* bzrlib/transport/http/_urllib.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/_pycurl.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/__init__.py: 
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.

* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.

* bzrlib/tests/test_repository.py: 
Does *not* use HttpServer.

* bzrlib/tests/test_http.py: 
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.

* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/treebuilder.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""TreeBuilder helper class.
18
18
 
19
 
TreeBuilders are used to build trees of various shapres or properties. This
 
19
TreeBuilders are used to build trees of various shapres or properties. This 
20
20
can be extremely useful in testing for instance.
21
21
"""
22
22
 
31
31
    def __init__(self):
32
32
        """Construct a TreeBuilder."""
33
33
        self._tree = None
34
 
        self._root_done = False
35
34
 
36
35
    def build(self, recipe):
37
36
        """Build recipe into the current tree.
41
40
            '/' then a directory is added, otherwise a regular file is added.
42
41
        """
43
42
        self._ensure_building()
44
 
        if not self._root_done:
45
 
            self._tree.add('', 'root-id', 'directory')
46
 
            self._root_done = True
47
43
        for name in recipe:
 
44
            assert isinstance(name, basestring)
48
45
            if name[-1] == '/':
49
46
                self._tree.mkdir(name[:-1])
50
47
            else:
58
55
        """Raise NotBuilding if there is no current tree being built."""
59
56
        if self._tree is None:
60
57
            raise errors.NotBuilding
61
 
 
 
58
            
62
59
    def finish_tree(self):
63
60
        """Finish building the current tree."""
64
61
        self._ensure_building()
68
65
 
69
66
    def start_tree(self, tree):
70
67
        """Start building on tree.
71
 
 
72
 
        :param tree: A tree to start building on. It must provide the
 
68
        
 
69
        :param tree: A tree to start building on. It must provide the 
73
70
            MutableTree interface.
74
71
        """
75
72
        if self._tree is not None:
76
73
            raise errors.AlreadyBuilding
77
74
        self._tree = tree
78
75
        self._tree.lock_tree_write()
 
76