diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /test/test_app.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
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): |