← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/treeshape.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:
bzrlib/tests/treeshape.py
1
 
# Copyright (C) 2005, 2010 Canonical Ltd
 
1
# Copyright (C) 2005 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
41
41
 
42
42
    The template is built relative to the Python process's current
43
43
    working directory.
44
 
 
45
 
    ('foo/',) will build a directory.
46
 
    ('foo', 'bar') will write 'bar' to 'foo'
47
 
    ('foo@', 'linktarget') will raise an error
48
44
    """
49
45
    for tt in template:
50
46
        name = tt[0]
51
47
        if name[-1] == '/':
52
48
            os.mkdir(name)
53
49
        elif name[-1] == '@':
54
 
            os.symlink(tt[1], tt[0][:-1])
 
50
            raise NotImplementedError('symlinks not handled yet')
55
51
        else:
56
52
            f = file(name, 'wb')
57
53
            try: