diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 16:17:05 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 16:17:05 +1300 |
commit | 9c88622e25033cab300d2bbde2811c346c3caa8c (patch) | |
tree | 70ad615eba3084de7955a50acda6ec45d3ae4638 /test/test_proxy.py | |
parent | 0906ee94acc2c25d4cb836461263d7a2d35b8b4a (diff) | |
download | mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.tar.gz mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.tar.bz2 mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.zip |
Adjust tests
Diffstat (limited to 'test/test_proxy.py')
-rw-r--r-- | test/test_proxy.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index c396183b..641b4f47 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -70,9 +70,9 @@ class TestProcessProxyOptions: def test_simple(self): assert self.p() - def test_confdir(self): - with tutils.tmpdir() as confdir: - self.assert_noerr("--confdir", confdir) + def test_cadir(self): + with tutils.tmpdir() as cadir: + self.assert_noerr("--cadir", cadir) @mock.patch("libmproxy.platform.resolver", None) def test_no_transparent(self): @@ -94,12 +94,12 @@ class TestProcessProxyOptions: self.assert_err("mutually exclusive", "-R", "http://localhost", "-T") def test_client_certs(self): - with tutils.tmpdir() as confdir: - self.assert_noerr("--client-certs", confdir) + with tutils.tmpdir() as cadir: + self.assert_noerr("--client-certs", cadir) self.assert_err("directory does not exist", "--client-certs", "nonexistent") def test_certs(self): - with tutils.tmpdir() as confdir: + with tutils.tmpdir() as cadir: self.assert_noerr("--cert", tutils.test_data.path("data/testkey.pem")) self.assert_err("does not exist", "--cert", "nonexistent") |