Options unification: simple strings

Move all simple string options to the new scheme. Also regularise some names.

3 files changed, 8 insertions, 8 deletions

diff --git a/test/mitmproxy/proxy/test_server.py b/test/mitmproxy/proxy/test_server.py
index eb40dd14..bcfecf6f 100644
--- a/test/mitmproxy/proxy/test_server.py
+++ b/test/mitmproxy/proxy/test_server.py
@@ -342,22 +342,22 @@ class TestHTTPS(tservers.HTTPProxyTest, CommonMixin, TcpMixin):
 
     def test_clientcert_file(self):
         try:
-            self.config.clientcerts = os.path.join(
+            self.config.client_certs = os.path.join(
                 tutils.test_data.path("mitmproxy/data/clientcert"), "client.pem")
             f = self.pathod("304")
             assert f.status_code == 304
             assert self.server.last_log()["request"]["clientcert"]["keyinfo"]
         finally:
-            self.config.clientcerts = None
+            self.config.client_certs = None
 
     def test_clientcert_dir(self):
         try:
-            self.config.clientcerts = tutils.test_data.path("mitmproxy/data/clientcert")
+            self.config.client_certs = tutils.test_data.path("mitmproxy/data/clientcert")
             f = self.pathod("304")
             assert f.status_code == 304
             assert self.server.last_log()["request"]["clientcert"]["keyinfo"]
         finally:
-            self.config.clientcerts = None
+            self.config.client_certs = None
 
     def test_error_post_connect(self):
         p = self.pathoc()
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
index 6e360875..5dd4a9e3 100644
--- a/test/mitmproxy/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
@@ -96,12 +96,12 @@ class TestProcessProxyOptions:
 
     def test_upstream_trusted_cadir(self):
         expected_dir = "/path/to/a/ca/dir"
-        p = self.assert_noerr("--upstream-trusted-cadir", expected_dir)
+        p = self.assert_noerr("--ssl-verify-upstream-trusted-cadir", expected_dir)
         assert p.options.ssl_verify_upstream_trusted_cadir == expected_dir
 
     def test_upstream_trusted_ca(self):
         expected_file = "/path/to/a/cert/file"
-        p = self.assert_noerr("--upstream-trusted-ca", expected_file)
+        p = self.assert_noerr("--ssl-verify-upstream-trusted-ca", expected_file)
         assert p.options.ssl_verify_upstream_trusted_ca == expected_file
 
 
diff --git a/test/mitmproxy/tools/test_cmdline.py b/test/mitmproxy/tools/test_cmdline.py
index b9f9d00d..bae68f83 100644
--- a/test/mitmproxy/tools/test_cmdline.py
+++ b/test/mitmproxy/tools/test_cmdline.py
@@ -11,8 +11,8 @@ def test_common():
 
     assert cmdline.get_common_options(args)
 
-    args.stickycookie_filt = "foo"
-    args.stickyauth_filt = "foo"
+    args.stickycookie = "foo"
+    args.stickyauth = "foo"
     v = cmdline.get_common_options(args)
     assert v["stickycookie"] == "foo"
     assert v["stickyauth"] == "foo"