diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:31:30 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:31:30 +0200 |
commit | bba5ec7144f0e08d4b26bad2987c6e7f0871b83d (patch) | |
tree | e462047f6169bd64b6bab99b8d8259bb0697bcf9 /test/tutils.py | |
parent | 88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef (diff) | |
download | mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.gz mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.bz2 mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.zip |
experimental: run tests using py.tests
Diffstat (limited to 'test/tutils.py')
-rw-r--r-- | test/tutils.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/tutils.py b/test/tutils.py index f1db7842..cc8c407f 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -6,16 +6,13 @@ import sys from cStringIO import StringIO from contextlib import contextmanager -from nose.plugins.skip import SkipTest -from mock import Mock +from unittest.case import SkipTest import netlib.tutils from libmproxy import utils, controller from libmproxy.models import ( ClientConnection, ServerConnection, Error, HTTPRequest, HTTPResponse, HTTPFlow ) -from libmproxy.console.flowview import FlowView -from libmproxy.console import ConsoleState def _SkipWindows(*args): |