diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_utils.py | 6 | ||||
| -rw-r--r-- | test/tutils.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 434d6b26..94523676 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -281,6 +281,12 @@ class udummy_ca(libpry.AutoTree): assert utils.dummy_ca(path) assert os.path.exists(path) + path = os.path.join(d, "foo/cert2.pem") + assert utils.dummy_ca(path) + assert os.path.exists(path) + assert os.path.exists(os.path.join(d, "foo/cert2-cert.pem")) + assert os.path.exists(os.path.join(d, "foo/cert2-cert.p12")) + class udummy_cert(libpry.AutoTree): def test_with_ca(self): diff --git a/test/tutils.py b/test/tutils.py index ae9dea27..fea7f224 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -43,7 +43,7 @@ HTTPS_PORT = random.randint(30000, 40000) class TestMaster(controller.Master): def __init__(self, port, testq): - serv = proxy.ProxyServer(proxy.Config("data/testkey.pem"), port) + serv = proxy.ProxyServer(proxy.SSLConfig("data/testkey.pem"), port) controller.Master.__init__(self, serv) self.testq = testq self.log = [] |