From d4f4beb6c7e9a0145f8affc6053ee01330f6f3be Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 3 Nov 2016 07:57:25 +1300 Subject: tests: add mitmdump --sysinfo to tests runs for platform info --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 8e3e51de..e2921464 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ deps = passenv = CODECOV_TOKEN CI CI_* TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* setenv = HOME = {envtmpdir} commands = + mitmdump --sysinfo py.test --timeout 60 {posargs} {env:CI_COMMANDS:python -c ""} @@ -19,6 +20,7 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:lint] commands = + mitmdump --sysinfo flake8 --jobs 8 --count mitmproxy pathod examples test rstcheck README.rst mypy --silent-imports mitmproxy/addons mitmproxy/addonmanager.py mitmproxy/proxy/protocol/ -- cgit v1.2.3 From 5109fd8ecb3e2b6b5c15ab07fc98d354c240b842 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 3 Nov 2016 08:08:34 +1300 Subject: Change antiquated test cipher suites This breaks Travis, possibly due to OpenSSL version. --- test/mitmproxy/net/test_tcp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/mitmproxy/net/test_tcp.py b/test/mitmproxy/net/test_tcp.py index 151cb12b..3238ab2f 100644 --- a/test/mitmproxy/net/test_tcp.py +++ b/test/mitmproxy/net/test_tcp.py @@ -380,14 +380,14 @@ class TestSNI(tservers.ServerTestBase): class TestServerCipherList(tservers.ServerTestBase): handler = ClientCipherListHandler ssl = dict( - cipher_list='RC4-SHA' + cipher_list='AES256-GCM-SHA384' ) def test_echo(self): c = tcp.TCPClient(("127.0.0.1", self.port)) with c.connect(): c.convert_to_ssl(sni="foo.com") - assert c.rfile.readline() == b"['RC4-SHA']" + assert c.rfile.readline() == b"['AES256-GCM-SHA384']" class TestServerCurrentCipher(tservers.ServerTestBase): @@ -400,14 +400,14 @@ class TestServerCurrentCipher(tservers.ServerTestBase): self.wfile.flush() ssl = dict( - cipher_list='RC4-SHA' + cipher_list='AES256-GCM-SHA384' ) def test_echo(self): c = tcp.TCPClient(("127.0.0.1", self.port)) with c.connect(): c.convert_to_ssl(sni="foo.com") - assert b"RC4-SHA" in c.rfile.readline() + assert b'AES256-GCM-SHA384' in c.rfile.readline() class TestServerCipherListError(tservers.ServerTestBase): -- cgit v1.2.3