diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-11-03 10:33:51 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 10:33:51 +1300 |
| commit | e1cea563792f668341bb840b5c77e70cff921755 (patch) | |
| tree | 73f9a1df8602beaf3581ed1a06ce0f846574784b | |
| parent | 356cf0f36e7f49225365eef34279831f24675061 (diff) | |
| parent | 5109fd8ecb3e2b6b5c15ab07fc98d354c240b842 (diff) | |
| download | mitmproxy-e1cea563792f668341bb840b5c77e70cff921755.tar.gz mitmproxy-e1cea563792f668341bb840b5c77e70cff921755.tar.bz2 mitmproxy-e1cea563792f668341bb840b5c77e70cff921755.zip | |
Merge pull request #1705 from cortesi/tests
Fix Travis cipher-suite related breakage
| -rw-r--r-- | test/mitmproxy/net/test_tcp.py | 8 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 6 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): @@ -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/ |