diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_console_help.py | 2 | ||||
| -rw-r--r-- | test/test_flow.py | 2 | ||||
| -rw-r--r-- | test/test_proxy.py | 5 | ||||
| -rw-r--r-- | test/test_script.py | 1 | ||||
| -rw-r--r-- | test/test_server.py | 5 | ||||
| -rw-r--r-- | test/test_utils.py | 3 | ||||
| -rw-r--r-- | test/tutils.py | 3 |
7 files changed, 4 insertions, 17 deletions
diff --git a/test/test_console_help.py b/test/test_console_help.py index c9ef7228..98e202ad 100644 --- a/test/test_console_help.py +++ b/test/test_console_help.py @@ -1,6 +1,4 @@ -import sys import libmproxy.console.help as help -from libmproxy import utils, flow, encoding class DummyMaster: def make_view(self): diff --git a/test/test_flow.py b/test/test_flow.py index 99df9ed0..03ed9a9a 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -2,9 +2,7 @@ import Queue, time, os.path from cStringIO import StringIO import email.utils from libmproxy import filt, flow, controller, utils, tnetstring -from netlib import certutils import tutils -import libpry class TestStickyCookieState: diff --git a/test/test_proxy.py b/test/test_proxy.py index 10587168..e137c687 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -1,7 +1,4 @@ -import cStringIO, textwrap -from cStringIO import StringIO -import libpry -from libmproxy import proxy, flow +from libmproxy import proxy import tutils diff --git a/test/test_script.py b/test/test_script.py index 88f32ddf..407c9b4b 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -1,4 +1,3 @@ -import os from libmproxy import script, flow import tutils diff --git a/test/test_server.py b/test/test_server.py index 86dc0a4a..a4257fad 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -1,7 +1,4 @@ -import urllib, urllib2, unittest -import time -import libpathod.test, requests -from netlib import tcp, http +from netlib import tcp import tutils """ diff --git a/test/test_utils.py b/test/test_utils.py index e23d919f..49312a4b 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,6 +1,5 @@ -import textwrap, re, json +import json from libmproxy import utils -from nose.tools import assert_raises import tutils utils.CERT_SLEEP_TIME = 0 diff --git a/test/tutils.py b/test/tutils.py index a35dc4d4..cfe9bffd 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -1,11 +1,10 @@ -import threading, Queue, time +import threading, Queue import os, shutil, tempfile from contextlib import contextmanager from libmproxy import proxy, flow, controller, utils from netlib import certutils import human_curl as hurl import libpathod.test -import random def treq(conn=None): if not conn: |