diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
| commit | ec92fca8c030fe5971a034a658033f70965b990a (patch) | |
| tree | ef9a2049eeab539d13e1f9662fd51220ab4ee817 /test/test_app.py | |
| parent | 0f8e8ee1ad667c8d747d5876f9b630ecbc01d7e9 (diff) | |
| parent | a05a70d8168a07c92b2a3ecbbb1958d85532efe3 (diff) | |
| download | mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.gz mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.bz2 mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test/test_app.py')
| -rw-r--r-- | test/test_app.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/test_app.py b/test/test_app.py index 0b6ed14c..5fb49563 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -1,8 +1,13 @@ -import mock, socket, os, time +import mock +import socket +import os +import time from libmproxy import dump from netlib import certutils, tcp from libpathod.pathoc import Pathoc -import tutils, tservers +import tutils +import tservers + class TestApp(tservers.HTTPProxTest): def test_basic(self): |