diff options
| author | Aldo Cortesi <aldo@corte.si> | 2012-07-16 16:54:09 -0700 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2012-07-16 16:54:09 -0700 |
| commit | 2be31b726ac38132c7a3f89cc3d47afe666c5f53 (patch) | |
| tree | 8f14ecc06ebae9995e74f82f01e2ef3007c412d8 /test/tutils.py | |
| parent | e4079aa746e861c5d39f2812520e33c4d17d1007 (diff) | |
| parent | 1a26f8215de76cb21e4c9100b4a8f766f872ac38 (diff) | |
| download | mitmproxy-2be31b726ac38132c7a3f89cc3d47afe666c5f53.tar.gz mitmproxy-2be31b726ac38132c7a3f89cc3d47afe666c5f53.tar.bz2 mitmproxy-2be31b726ac38132c7a3f89cc3d47afe666c5f53.zip | |
Merge pull request #51 from dnet/master
Test cleanup and missing dependencies
Diffstat (limited to 'test/tutils.py')
| -rw-r--r-- | test/tutils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py index a35dc4d4..0e661a4b 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: @@ -51,7 +50,7 @@ class TestMaster(flow.FlowMaster): self.testq = testq def handle(self, m): - f = flow.FlowMaster.handle(self, m) + flow.FlowMaster.handle(self, m) m._ack() |