diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
| commit | 2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (patch) | |
| tree | 72604de5152bdf15147a78e03a669a207baeac95 /test/test_proxy.py | |
| parent | 3032672f10c727623ee085d04d623901dac856df (diff) | |
| parent | 221973aff6553ffb1d40859c5d35b88d959f9718 (diff) | |
| download | mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.gz mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.bz2 mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test/test_proxy.py')
| -rw-r--r-- | test/test_proxy.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index c42d66e7..b15e3f84 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -70,10 +70,6 @@ class TestProcessProxyOptions: def test_simple(self): assert self.p() - def test_cert(self): - self.assert_noerr("--cert", tutils.test_data.path("data/testkey.pem")) - self.assert_err("does not exist", "--cert", "nonexistent") - def test_confdir(self): with tutils.tmpdir() as confdir: self.assert_noerr("--confdir", confdir) @@ -90,11 +86,16 @@ class TestProcessProxyOptions: self.assert_err("invalid reverse proxy", "-P", "reverse") self.assert_noerr("-P", "http://localhost") - def test_certs(self): + def test_client_certs(self): with tutils.tmpdir() as confdir: self.assert_noerr("--client-certs", confdir) self.assert_err("directory does not exist", "--client-certs", "nonexistent") + def test_certs(self): + with tutils.tmpdir() as confdir: + self.assert_noerr("--cert", tutils.test_data.path("data/testkey.pem")) + self.assert_err("does not exist", "--cert", "nonexistent") + def test_auth(self): p = self.assert_noerr("--nonanonymous") assert p.authenticator |