← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_debug.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/blackbox/test_debug.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 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
21
21
import sys
22
22
import time
23
23
 
24
 
from bzrlib import debug, tests
25
 
 
26
 
 
27
 
class TestDebugOption(tests.TestCaseInTempDir):
 
24
from bzrlib.tests import TestCaseInTempDir
 
25
 
 
26
 
 
27
class TestDebugOption(TestCaseInTempDir):
28
28
 
29
29
    def test_dash_derror(self):
30
30
        """With -Derror, tracebacks are shown even for user errors"""
38
38
    def test_dash_dlock(self):
39
39
        # With -Dlock, locking and unlocking is recorded into the log
40
40
        self.run_bzr("-Dlock init foo")
41
 
        self.assertContainsRe(self.get_log(), "lock_write")
42
 
 
43
 
 
44
 
class TestDebugBytes(tests.TestCaseWithTransport):
45
 
 
46
 
    def test_bytes_reports_activity(self):
47
 
        tree = self.make_branch_and_tree('tree')
48
 
        self.build_tree(['tree/one'])
49
 
        tree.add('one')
50
 
        rev_id = tree.commit('first')
51
 
        remote_trans = self.make_smart_server('.')
52
 
        # I would like to avoid run_bzr_subprocess here, but we need it to be
53
 
        # connected to a real TextUIFactory. The NullProgressView always
54
 
        # ignores transport activity.
55
 
        env = {'BZR_PROGRESS_BAR': 'text'}
56
 
        out, err = self.run_bzr_subprocess('branch -Dbytes %s/tree target'
57
 
                                           % (remote_trans.base,),
58
 
                                           env_changes=env)
59
 
        self.assertContainsRe(err, 'Branched 1 revision')
60
 
        self.assertContainsRe(err, 'Transferred:.*kB')
 
41
        trace_messages = self._get_log(keep_log_file=True)
 
42
        self.assertContainsRe(trace_messages, "lock_write")