Merge branch 'master' into stream

Conflicts:
	netlib/http.py

1 files changed, 36 insertions, 29 deletions

diff --git a/test/test_certutils.py b/test/test_certutils.py
index 176575ea..95a7280e 100644
--- a/test/test_certutils.py
+++ b/test/test_certutils.py
@@ -3,34 +3,34 @@ from netlib import certutils, certffi
 import OpenSSL
 import tutils
 
-class TestDNTree:
-    def test_simple(self):
-        d = certutils.DNTree()
-        d.add("foo.com", "foo")
-        d.add("bar.com", "bar")
-        assert d.get("foo.com") == "foo"
-        assert d.get("bar.com") == "bar"
-        assert not d.get("oink.com")
-        assert not d.get("oink")
-        assert not d.get("")
-        assert not d.get("oink.oink")
-
-        d.add("*.match.org", "match")
-        assert not d.get("match.org")
-        assert d.get("foo.match.org") == "match"
-        assert d.get("foo.foo.match.org") == "match"
-
-    def test_wildcard(self):
-        d = certutils.DNTree()
-        d.add("foo.com", "foo")
-        assert not d.get("*.foo.com")
-        d.add("*.foo.com", "wild")
-
-        d = certutils.DNTree()
-        d.add("*", "foo")
-        assert d.get("foo.com") == "foo"
-        assert d.get("*.foo.com") == "foo"
-        assert d.get("com") == "foo"
+# class TestDNTree:
+#     def test_simple(self):
+#         d = certutils.DNTree()
+#         d.add("foo.com", "foo")
+#         d.add("bar.com", "bar")
+#         assert d.get("foo.com") == "foo"
+#         assert d.get("bar.com") == "bar"
+#         assert not d.get("oink.com")
+#         assert not d.get("oink")
+#         assert not d.get("")
+#         assert not d.get("oink.oink")
+#
+#         d.add("*.match.org", "match")
+#         assert not d.get("match.org")
+#         assert d.get("foo.match.org") == "match"
+#         assert d.get("foo.foo.match.org") == "match"
+#
+#     def test_wildcard(self):
+#         d = certutils.DNTree()
+#         d.add("foo.com", "foo")
+#         assert not d.get("*.foo.com")
+#         d.add("*.foo.com", "wild")
+#
+#         d = certutils.DNTree()
+#         d.add("*", "foo")
+#         assert d.get("foo.com") == "foo"
+#         assert d.get("*.foo.com") == "foo"
+#         assert d.get("com") == "foo"
 
 
 class TestCertStore:
@@ -63,10 +63,17 @@ class TestCertStore:
             ca = certutils.CertStore.from_store(d, "test")
             c1 = ca.get_cert("foo.com", ["*.bar.com"])
             c2 = ca.get_cert("foo.bar.com", [])
-            assert c1 == c2
+            # assert c1 == c2
             c3 = ca.get_cert("bar.com", [])
             assert not c1 == c3
 
+    def test_sans_change(self):
+        with tutils.tmpdir() as d:
+            ca = certutils.CertStore.from_store(d, "test")
+            _ = ca.get_cert("foo.com", ["*.bar.com"])
+            cert, key = ca.get_cert("foo.bar.com", ["*.baz.com"])
+            assert "*.baz.com" in cert.altnames
+
     def test_overrides(self):
         with tutils.tmpdir() as d:
             ca1 = certutils.CertStore.from_store(os.path.join(d, "ca1"), "test")