← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version.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/test_version.py
1
 
# Copyright (C) 2006, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
 
17
18
"""Tests for versioning of bzrlib."""
18
19
 
19
 
from cStringIO import StringIO
20
 
import re
21
 
 
22
20
from bzrlib import version, workingtree
23
21
from bzrlib.tests import TestCase, TestSkipped
24
22
 
26
24
 
27
25
    def test_get_bzr_source_tree(self):
28
26
        """Get tree for bzr source, if any."""
29
 
        self.permit_source_tree_branch_repo()
30
27
        # We don't know if these tests are being run from a checkout or branch
31
28
        # of bzr, from an installed copy, or from source unpacked from a
32
29
        # tarball.  We don't construct a branch just for testing this, so we
37
34
        else:
38
35
            # ensure that what we got was in fact a working tree instance.
39
36
            self.assertIsInstance(src_tree, workingtree.WorkingTree)
40
 
 
41
 
    def test_python_binary_path(self):
42
 
        self.permit_source_tree_branch_repo()
43
 
        sio = StringIO()
44
 
        version.show_version(show_config=False, show_copyright=False,
45
 
            to_file=sio)
46
 
        out = sio.getvalue()
47
 
        m = re.search(r"Python interpreter: (.*) [0-9]", out)
48
 
        self.assertIsNot(m, None)
49
 
        self.assertPathExists(m.group(1))