← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_utils.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-11 10:59:23 UTC
  • mto: (5247.1.7 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100611105923-c3uz1j77sh4bnkhh
The default http protocol version wasn't properly defined and as such not respected by some parametrized tests.

* bzrlib/tests/test_http.py:
(load_tests): Some tests need to be parametrized by the protocol
version only.
(TestAuthOnRedirected): These test are for urllib only but should
be parametrized by the http protocol version.

* bzrlib/tests/test_bzrdir.py:
(TestHTTPRedirections): Mention that we rely on the default http
protocol version.

* bzrlib/tests/http_utils.py:
(TestCaseWithWebserver): Set a default protocol version that can
be overriden by daughter classes.
(TestCaseWithWebserver.create_transport_readonly_server)
(TestCaseWithTwoWebservers.create_transport_secondary_server)
(TestCaseWithRedirectedWebserver.create_transport_secondary_server):
Ouch, the http protocol version is lost if we don't propagate it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_utils.py
106
106
    one. This will currently fail if the primary transport is not
107
107
    backed by regular disk files.
108
108
    """
 
109
 
 
110
    # This can be overriden or parametrized by daughter clasess if needed, but
 
111
    # it must exist so that the create_transport_readonly_server() method can
 
112
    # propagate it.
 
113
    _protocol_version = None
 
114
 
109
115
    def setUp(self):
110
116
        super(TestCaseWithWebserver, self).setUp()
111
117
        self.transport_readonly_server = http_server.HttpServer
112
118
 
 
119
    def create_transport_readonly_server(self):
 
120
        return self.transport_readonly_server(
 
121
            protocol_version=self._protocol_version)
 
122
 
113
123
 
114
124
class TestCaseWithTwoWebservers(TestCaseWithWebserver):
115
125
    """A support class providing readonly urls on two servers that are http://.
127
137
 
128
138
        This is mostly a hook for daughter classes.
129
139
        """
130
 
        return self.transport_secondary_server()
 
140
        return self.transport_secondary_server(
 
141
            protocol_version=self._protocol_version)
131
142
 
132
143
    def get_secondary_server(self):
133
144
        """Get the server instance for the secondary transport."""
218
229
   def create_transport_secondary_server(self):
219
230
       """Create the secondary server redirecting to the primary server"""
220
231
       new = self.get_readonly_server()
221
 
       redirecting = HTTPServerRedirecting()
 
232
       redirecting = HTTPServerRedirecting(
 
233
           protocol_version=self._protocol_version)
222
234
       redirecting.redirect_to(new.host, new.port)
223
235
       return redirecting
224
236