Rev 3129: Test parametrization for protocol versions achieved. Tests are failing :) in file:///v/home/vila/src/bzr/bugs/175524/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 21 11:41:20 GMT 2007
At file:///v/home/vila/src/bzr/bugs/175524/
------------------------------------------------------------
revno: 3129
revision-id:v.ladeuil+lp at free.fr-20071221114115-357b0nvt3uq5v55h
parent: v.ladeuil+lp at free.fr-20071221094604-tw5le3agd94l5p0h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Fri 2007-12-21 12:41:15 +0100
message:
Test parametrization for protocol versions achieved. Tests are failing :)
* bzrlib/tests/test_http_implementations.py:
(TransportAdapter, TransportProtocolAdapter,
TransportProtocolAuthenticationAdapter): Adpaters for the
combinations we care about.
(load_tests): List the classes that needs to be adpated and apply
the associated parametrization.
(TestPost.test_post_body_is_received): Don't use
transport.get_transport since we already know the transport class
we want to test.
(TestSpecificRequestHandler.create_transport_readonly_server,
LimitedRangeHTTPServer.__init__,
TestLimitedRangeRequestServer.create_transport_readonly_server,
TestProxyHttpServer.create_transport_secondary_server,
TestHTTPRedirections.create_transport_secondary_server,
TestHTTPSilentRedirections.create_transport_secondary_server,
TestAuth.create_transport_readonly_server,
TestAuth.create_transport_readonly_server): Add protocol_version
parameter to constructors.
* bzrlib/tests/http_utils.py:
(HTTPServerRedirecting, AuthServer, DigestAuthServer,
HTTPBasicAuthServer, HTTPDigestAuthServer, ProxyBasicAuthServer,
ProxyDigestAuthServer): Add protocol_version parameter to
constructors.
modified:
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
-------------- next part --------------
=== modified file 'bzrlib/tests/http_utils.py'
--- a/bzrlib/tests/http_utils.py 2007-12-21 09:44:07 +0000
+++ b/bzrlib/tests/http_utils.py 2007-12-21 11:41:15 +0000
@@ -145,8 +145,10 @@
class HTTPServerRedirecting(http_server.HttpServer):
"""An HttpServer redirecting to another server """
- def __init__(self, request_handler=RedirectRequestHandler):
- http_server.HttpServer.__init__(self, request_handler)
+ def __init__(self, request_handler=RedirectRequestHandler,
+ protocol_version=None):
+ http_server.HttpServer.__init__(self, request_handler,
+ protocol_version=protocol_version)
# redirections is a list of tuples (source, target, code)
# - source is a regexp for the paths requested
# - target is a replacement for re.sub describing where
@@ -307,8 +309,10 @@
auth_error_code = None
auth_realm = "Thou should not pass"
- def __init__(self, request_handler, auth_scheme):
- http_server.HttpServer.__init__(self, request_handler)
+ def __init__(self, request_handler, auth_scheme,
+ protocol_version=None):
+ http_server.HttpServer.__init__(self, request_handler,
+ protocol_version=protocol_version)
self.auth_scheme = auth_scheme
self.password_of = {}
self.auth_required_errors = 0
@@ -337,8 +341,10 @@
auth_nonce = 'now!'
- def __init__(self, request_handler, auth_scheme):
- AuthServer.__init__(self, request_handler, auth_scheme)
+ def __init__(self, request_handler, auth_scheme,
+ protocol_version=None):
+ AuthServer.__init__(self, request_handler, auth_scheme,
+ protocol_version=protocol_version)
def digest_authorized(self, auth, command):
nonce = auth['nonce']
@@ -399,32 +405,36 @@
class HTTPBasicAuthServer(HTTPAuthServer):
"""An HTTP server requiring basic authentication"""
- def __init__(self):
- HTTPAuthServer.__init__(self, BasicAuthRequestHandler, 'basic')
+ def __init__(self, protocol_version=None):
+ HTTPAuthServer.__init__(self, BasicAuthRequestHandler, 'basic',
+ protocol_version=protocol_version)
self.init_http_auth()
class HTTPDigestAuthServer(DigestAuthServer, HTTPAuthServer):
"""An HTTP server requiring digest authentication"""
- def __init__(self):
- DigestAuthServer.__init__(self, DigestAuthRequestHandler, 'digest')
+ def __init__(self, protocol_version=None):
+ DigestAuthServer.__init__(self, DigestAuthRequestHandler, 'digest',
+ protocol_version=protocol_version)
self.init_http_auth()
class ProxyBasicAuthServer(ProxyAuthServer):
"""A proxy server requiring basic authentication"""
- def __init__(self):
- ProxyAuthServer.__init__(self, BasicAuthRequestHandler, 'basic')
+ def __init__(self, protocol_version=None):
+ ProxyAuthServer.__init__(self, BasicAuthRequestHandler, 'basic',
+ protocol_version=protocol_version)
self.init_proxy_auth()
class ProxyDigestAuthServer(DigestAuthServer, ProxyAuthServer):
"""A proxy server requiring basic authentication"""
- def __init__(self):
- ProxyAuthServer.__init__(self, DigestAuthRequestHandler, 'digest')
+ def __init__(self, protocol_version=None):
+ ProxyAuthServer.__init__(self, DigestAuthRequestHandler, 'digest',
+ protocol_version=protocol_version)
self.init_proxy_auth()
=== modified file 'bzrlib/tests/test_http_implementations.py'
--- a/bzrlib/tests/test_http_implementations.py 2007-12-20 19:54:56 +0000
+++ b/bzrlib/tests/test_http_implementations.py 2007-12-21 11:41:15 +0000
@@ -56,28 +56,47 @@
pycurl_present = False
-class HTTPImplementationsTestProviderAdapter(tests.TestScenarioApplier):
+class TransportAdapter(tests.TestScenarioApplier):
+ """Generate the same test for each transport implementation."""
def __init__(self):
transport_scenarios = [
- ('urllib',
- dict(_transport=_urllib.HttpTransport_urllib,
- _server=http_server.HttpServer_urllib,
- _qualified_prefix='http+urllib',
- )),]
+ ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
+ _server=http_server.HttpServer_urllib,
+ _qualified_prefix='http+urllib',)),
+ ]
if pycurl_present:
transport_scenarios.append(
('pycurl', dict(_transport=PyCurlTransport,
_server=http_server.HttpServer_PyCurl,
- _qualified_prefix='http+pycurl',
- )))
+ _qualified_prefix='http+pycurl',)))
self.scenarios = transport_scenarios
-class AuthenticationTestProviderAdapter(HTTPImplementationsTestProviderAdapter):
-
- def __init__(self):
- super(AuthenticationTestProviderAdapter, self).__init__()
+class TransportProtocolAdapter(TransportAdapter):
+ """Generate the same test for each protocol implementation.
+
+ In addition to the transport adaptatation that we inherit from.
+ """
+
+ def __init__(self):
+ super(TransportProtocolAdapter, self).__init__()
+ protocol_scenarios = [
+ ('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
+ ('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
+ ]
+ self.scenarios = tests.multiply_scenarios(self.scenarios,
+ protocol_scenarios)
+
+
+class TransportProtocolAuthenticationAdapter(TransportProtocolAdapter):
+ """Generate the same test for each authentication scheme implementation.
+
+ In addition to the protocol adaptatation that we inherit from.
+ """
+
+ def __init__(self):
+ super(TransportProtocolAuthenticationAdapter, self).__init__()
auth_scheme_scenarios = [
('basic', dict(_auth_scheme='basic')),
('digest', dict(_auth_scheme='digest')),
@@ -86,17 +105,48 @@
self.scenarios = tests.multiply_scenarios(self.scenarios,
auth_scheme_scenarios)
-
def load_tests(standard_tests, module, loader):
"""Multiply tests for http clients and protocol versions."""
- http_adapter = HTTPImplementationsTestProviderAdapter()
- auth_adapter = AuthenticationTestProviderAdapter()
+ # one for each transport
+ t_adapter = TransportAdapter()
+ t_classes= (TestHttpTransportRegistration,
+ TestHttpTransportUrls,
+ )
+ is_testing_for_transports = tests.condition_isinstance(t_classes)
+
+ # multiplied by one for each protocol version
+ tp_adapter = TransportProtocolAdapter()
+ tp_classes= (TestDoCatchRedirections,
+ TestHTTPConnections,
+ TestHTTPRedirections,
+ TestHTTPSilentRedirections,
+ TestLimitedRangeRequestServer,
+ TestPost,
+ TestProxyHttpServer,
+ TestRanges,
+ TestSpecificRequestHandler,
+ )
+ is_also_testing_for_protocols = tests.condition_isinstance(tp_classes)
+
+ # multiplied by one for each authentication scheme
+ tpa_adapter = TransportProtocolAuthenticationAdapter()
+ tpa_classes = (TestAuth,
+ )
+ is_also_testing_for_authentication = tests.condition_isinstance(tpa_classes)
+
result = loader.suiteClass()
for test in tests.iter_suite_tests(standard_tests):
- if isinstance(test, TestAuth):
- result.addTests(auth_adapter.adapt(test))
+ # Each test is either standalone or testing for some combination of
+ # transport, protocol version, authentication scheme. Use the right
+ # adpater (or none) depending on the class.
+ if is_testing_for_transports(test):
+ result.addTests(t_adapter.adapt(test))
+ elif is_also_testing_for_protocols(test):
+ result.addTests(tp_adapter.adapt(test))
+ elif is_also_testing_for_authentication(test):
+ result.addTests(tpa_adapter.adapt(test))
else:
- result.addTests(http_adapter.adapt(test))
+ result.addTests(test)
return result
@@ -138,7 +188,7 @@
server.tearDown()
-class TestHttpConnections(http_utils.TestCaseWithWebserver):
+class TestHTTPConnections(http_utils.TestCaseWithWebserver):
"""Test the http connections."""
def setUp(self):
@@ -203,10 +253,7 @@
self.addCleanup(server.tearDown)
scheme = self._qualified_prefix
url = '%s://%s:%s/' % (scheme, server.host, server.port)
- try:
- http_transport = transport.get_transport(url)
- except errors.UnsupportedProtocol:
- raise tests.TestSkipped('%s not available' % scheme)
+ http_transport = self._transport(url)
code, response = http_transport._post('abc def end-of-body')
self.assertTrue(
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
@@ -238,7 +285,8 @@
_req_handler_class = http_server.TestingHTTPRequestHandler
def create_transport_readonly_server(self):
- return http_server.HttpServer(self._req_handler_class)
+ return http_server.HttpServer(self._req_handler_class,
+ protocol_version=self._protocol_version)
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
@@ -585,8 +633,10 @@
"""An HttpServer erroring out on requests with too much range specifiers"""
def __init__(self, request_handler=LimitedRangeRequestHandler,
+ protocol_version=None,
range_limit=None):
- http_server.HttpServer.__init__(self, request_handler)
+ http_server.HttpServer.__init__(self, request_handler,
+ protocol_version=protocol_version)
self.range_limit = range_limit
@@ -597,7 +647,8 @@
def create_transport_readonly_server(self):
# Requests with more range specifiers will error out
- return LimitedRangeHTTPServer(range_limit=self.range_limit)
+ return LimitedRangeHTTPServer(range_limit=self.range_limit,
+ protocol_version=self._protocol_version)
def get_transport(self):
return self._transport(self.get_readonly_server().get_url())
@@ -666,7 +717,7 @@
"""Creates an http server that will serve files with
'-proxied' appended to their names.
"""
- return http_utils.ProxyServer()
+ return http_utils.ProxyServer(protocol_version=self._protocol_version)
def _install_env(self, env):
for name, value in env.iteritems():
@@ -750,7 +801,8 @@
"""Create the secondary server redirecting to the primary server"""
new = self.get_readonly_server()
- redirecting = http_utils.HTTPServerRedirecting()
+ redirecting = http_utils.HTTPServerRedirecting(
+ protocol_version=self._protocol_version)
redirecting.redirect_to(new.host, new.port)
return redirecting
@@ -837,7 +889,8 @@
def create_transport_secondary_server(self):
"""Create the secondary server, redirections are defined in the tests"""
- return http_utils.HTTPServerRedirecting()
+ return http_utils.HTTPServerRedirecting(
+ protocol_version=self._protocol_version)
def test_one_redirection(self):
t = self.old_transport
@@ -929,12 +982,14 @@
def create_transport_readonly_server(self):
if self._auth_scheme == 'basic':
- server = http_utils.HTTPBasicAuthServer()
+ server = http_utils.HTTPBasicAuthServer(
+ protocol_version=self._protocol_version)
else:
if self._auth_scheme != 'digest':
raise AssertionError('Unknown auth scheme: %r'
% self._auth_scheme)
- server = http_utils.HTTPDigestAuthServer()
+ server = http_utils.HTTPDigestAuthServer(
+ protocol_version=self._protocol_version)
return server
def _testing_pycurl(self):
@@ -1071,12 +1126,14 @@
def create_transport_readonly_server(self):
if self._auth_scheme == 'basic':
- server = http_utils.ProxyBasicAuthServer()
+ server = http_utils.ProxyBasicAuthServer(
+ protocol_version=self._protocol_version)
else:
if self._auth_scheme != 'digest':
raise AssertionError('Unknown auth scheme: %r'
% self._auth_scheme)
- server = http_utils.ProxyDigestAuthServer()
+ server = http_utils.ProxyDigestAuthServer(
+ protocol_version=self._protocol_version)
return server
def get_user_transport(self, user=None, password=None):
More information about the bazaar-commits
mailing list