diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-02-20 11:04:07 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-02-20 11:04:07 +1300 |
commit | b0f77dfefd13006a4355d137b7ac7840c14eef3d (patch) | |
tree | 87d60717ba65c5653ef5f40732734de89f16e5c6 /test/tutils.py | |
parent | fa11b7c9be7cb41f422e2be26c0673fbe371ce55 (diff) | |
download | mitmproxy-b0f77dfefd13006a4355d137b7ac7840c14eef3d.tar.gz mitmproxy-b0f77dfefd13006a4355d137b7ac7840c14eef3d.tar.bz2 mitmproxy-b0f77dfefd13006a4355d137b7ac7840c14eef3d.zip |
Unit test import cleanups.
Diffstat (limited to 'test/tutils.py')
-rw-r--r-- | test/tutils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/tutils.py b/test/tutils.py index 87977b1c..c22eb1a0 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -1,6 +1,6 @@ -import os.path, threading, Queue +import threading, Queue import libpry -from libmproxy import proxy, filt, flow, controller +from libmproxy import proxy, flow, controller import serv, sslserv import random @@ -50,8 +50,8 @@ HTTPS_PORT = random.randint(30000, 40000) class TestMaster(controller.Master): def __init__(self, port, testq): - serv = proxy.ProxyServer(proxy.ProxyConfig("data/testkey.pem"), port) - controller.Master.__init__(self, serv) + s = proxy.ProxyServer(proxy.ProxyConfig("data/testkey.pem"), port) + controller.Master.__init__(self, s) self.testq = testq self.log = [] |