diff options
author | Rouli <rouli.net@gmail.com> | 2013-01-17 17:36:18 +0200 |
---|---|---|
committer | Rouli <rouli.net@gmail.com> | 2013-01-17 17:36:18 +0200 |
commit | 6212b69fb4f137db0c72bb8f3126f530c3f0daee (patch) | |
tree | e7ea377fddb090d7db41a2c418745ddc593361c6 | |
parent | 446f9f0a0fc12159ba663d3b8bdc8f1206a197c7 (diff) | |
download | mitmproxy-6212b69fb4f137db0c72bb8f3126f530c3f0daee.tar.gz mitmproxy-6212b69fb4f137db0c72bb8f3126f530c3f0daee.tar.bz2 mitmproxy-6212b69fb4f137db0c72bb8f3126f530c3f0daee.zip |
fixes due to merge with master
-rw-r--r-- | test/test_server.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_server.py b/test/test_server.py index 76f24743..ee6873c7 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -1,5 +1,6 @@ from netlib import tcp -import tutils +from time import sleep +import tutils, socket """ Note that the choice of response code in these tests matters more than you |