kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-03-26 08:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1705 from cortesi/tests

Browse Source 
Fix Travis cipher-suite related breakage
This commit is contained in:
Aldo Cortesi
2016-11-03 10:33:51 +13:00
committed by GitHub
parent 356cf0f36e 5109fd8ecb
commit e1cea56379
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/mitmproxy/net/test_tcp.py
View File

@@ -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):

2
tox.ini
View File

@@ -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/