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 | |
| 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')
| -rw-r--r-- | test/test_console_common.py | 2 | ||||
| -rw-r--r-- | test/test_console_help.py | 2 | ||||
| -rw-r--r-- | test/test_console_palettes.py | 2 | ||||
| -rw-r--r-- | test/test_server.py | 4 | ||||
| -rw-r--r-- | test/tutils.py | 5 |
5 files changed, 8 insertions, 7 deletions
diff --git a/test/test_console_common.py b/test/test_console_common.py index 459539c5..3e176d75 100644 --- a/test/test_console_common.py +++ b/test/test_console_common.py @@ -1,5 +1,5 @@ import os -from nose.plugins.skip import SkipTest +from unittest.case import SkipTest if os.name == "nt": raise SkipTest("Skipped on Windows.") diff --git a/test/test_console_help.py b/test/test_console_help.py index a7a8b745..dc2591e5 100644 --- a/test/test_console_help.py +++ b/test/test_console_help.py @@ -1,5 +1,5 @@ import os -from nose.plugins.skip import SkipTest +from unittest.case import SkipTest if os.name == "nt": raise SkipTest("Skipped on Windows.") diff --git a/test/test_console_palettes.py b/test/test_console_palettes.py index a3b7fe4f..9cf5d95c 100644 --- a/test/test_console_palettes.py +++ b/test/test_console_palettes.py @@ -1,5 +1,5 @@ import os -from nose.plugins.skip import SkipTest +from unittest.case import SkipTest if os.name == "nt": raise SkipTest("Skipped on Windows.") import libmproxy.console.palettes as palettes diff --git a/test/test_server.py b/test/test_server.py index c81a2843..5f644c96 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -124,6 +124,8 @@ class TcpMixin: i2 = self.pathod("306") self._ignore_off() + self.master.masterq.join() + assert n.status_code == 304 assert i.status_code == 305 assert i2.status_code == 306 @@ -168,6 +170,8 @@ class TcpMixin: i2 = self.pathod("306") self._tcpproxy_off() + self.master.masterq.join() + assert n.status_code == 304 assert i.status_code == 305 assert i2.status_code == 306 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): |