/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/test_https_urllib.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
    config,
26
26
    trace,
27
27
)
28
 
from ..errors import (
29
 
    ConfigOptionValueError,
30
 
)
31
28
from .. import tests
32
29
from ..transport.http import _urllib2_wrappers
33
30
from ..transport.http._urllib2_wrappers import ssl
77
74
        stack = config.MemoryStack("ssl.cert_reqs = required\n")
78
75
        self.assertEqual(ssl.CERT_REQUIRED, stack.get("ssl.cert_reqs"))
79
76
        stack = config.MemoryStack("ssl.cert_reqs = invalid\n")
80
 
        self.assertRaises(ConfigOptionValueError, stack.get, "ssl.cert_reqs")
 
77
        self.assertRaises(config.ConfigOptionValueError, stack.get,
 
78
                          "ssl.cert_reqs")
81
79
 
82
80
 
83
81
class MatchHostnameTests(tests.TestCase):