/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/transport/http/wsgi.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
106
106
        # e.g. consider a smart server request for "get /etc/passwd" or
107
107
        # something.
108
108
        self.chroot_server = chroot.ChrootServer(backing_transport)
109
 
        self.chroot_server.start_server()
 
109
        self.chroot_server.setUp()
110
110
        self.backing_transport = get_transport(self.chroot_server.get_url())
111
111
        self.root_client_path = root_client_path
112
112
        # While the chroot server can technically be torn down at this point,
114
114
        # protocol dictionary, we don't *just in case* there are parts of
115
115
        # bzrlib that will invoke 'get_transport' on urls rather than cloning
116
116
        # around the existing transport.
117
 
        #self.chroot_server.stop_server()
 
117
        #self.chroot_server.tearDown()
118
118
 
119
119
    def __call__(self, environ, start_response):
120
120
        """WSGI application callable."""
176
176
    def make_request(self, transport, write_func, request_bytes, rcp):
177
177
        protocol_factory, unused_bytes = medium._get_protocol_factory_for_bytes(
178
178
            request_bytes)
179
 
        server_protocol = protocol_factory(
180
 
            transport, write_func, rcp, self.backing_transport)
 
179
        server_protocol = protocol_factory(transport, write_func, rcp)
181
180
        server_protocol.accept_bytes(unused_bytes)
182
181
        return server_protocol