diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2018-01-07 20:21:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 20:21:49 +0100 |
| commit | 94a173ab9c54c9f8a669c92cf77adcfbe902d565 (patch) | |
| tree | 346bc53ed2a4aff60eb8b44302952dcf30eeb629 /test/pathod/test_pathod.py | |
| parent | c1dad83b32a39cdc2db8168de51a4c3061292f36 (diff) | |
| parent | 4fb894cad4cf1c1d4a89eef8af35d4523a198f28 (diff) | |
| download | mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.tar.gz mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.tar.bz2 mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.zip | |
Merge pull request #2764 from Kriechi/ssl-tls
rename attributes, function and class names: s/ssl/tls/
Diffstat (limited to 'test/pathod/test_pathod.py')
| -rw-r--r-- | test/pathod/test_pathod.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py index c0011952..d6522cb6 100644 --- a/test/pathod/test_pathod.py +++ b/test/pathod/test_pathod.py @@ -153,7 +153,7 @@ class CommonTests(tservers.DaemonTests): c = tcp.TCPClient(("localhost", self.d.port)) with c.connect(): if self.ssl: - c.convert_to_ssl() + c.convert_to_tls() c.wfile.write(b"foo\n\n\n") c.wfile.flush() l = self.d.last_log() @@ -241,7 +241,7 @@ class TestDaemonSSL(CommonTests): with c.connect(): c.wfile.write(b"\0\0\0\0") with pytest.raises(exceptions.TlsException): - c.convert_to_ssl() + c.convert_to_tls() l = self.d.last_log() assert l["type"] == "error" assert "SSL" in l["msg"] |