~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_serializer.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-04 14:48:21 UTC
  • mto: (4349.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4350.
  • Revision ID: v.ladeuil+lp@free.fr-20090504144821-39dvqkikmd3zqkdg
Handle servers proposing several authentication schemes.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Several schemes can be
proposed by the server, try to match each one in turn.
(BasicAuthHandler.auth_match): Delete dead code.

* bzrlib/tests/test_http.py:
(load_tests): Separate proxy and http authentication tests as they
require different server setups.
(TestAuth.create_transport_readonly_server): Simplified by using
parameter provided by load_tests.
(TestAuth.test_changing_nonce): Adapt to new parametrization.
(TestProxyAuth.create_transport_readonly_server): Deleted.

* bzrlib/tests/http_utils.py:
(DigestAndBasicAuthRequestHandler, HTTPBasicAndDigestAuthServer,
ProxyBasicAndDigestAuthServer): Add a test server proposing both
basic and digest auth schemes but accepting only digest as valid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
 
21
21
from bzrlib import (
22
 
    chk_serializer,
23
22
    serializer,
 
23
    xml4,
24
24
    xml5,
25
25
    xml6,
26
26
    xml7,
33
33
    """Test serializer"""
34
34
 
35
35
    def test_registry(self):
 
36
        self.assertIs(xml4.serializer_v4,
 
37
                      serializer.format_registry.get('4'))
36
38
        self.assertIs(xml5.serializer_v5,
37
39
                      serializer.format_registry.get('5'))
38
40
        self.assertIs(xml6.serializer_v6,
41
43
                      serializer.format_registry.get('7'))
42
44
        self.assertIs(xml8.serializer_v8,
43
45
                      serializer.format_registry.get('8'))
44
 
        self.assertIs(chk_serializer.chk_serializer_255_bigpage,
45
 
                      serializer.format_registry.get('9'))