aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-08 17:19:47 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-08 17:19:47 +0100
commit2e50b1073538730fc5bd6369e2cb8176874f2f03 (patch)
treee7b9e8305f6d96faf6a5189efa1c93f3baf0634e /test
parent2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (diff)
downloadmitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.tar.gz
mitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.tar.bz2
mitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.zip
fix windows tests, include improvements from 0.10.1
Diffstat (limited to 'test')
-rw-r--r--test/test_console_search.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/test_console_search.py b/test/test_console_search.py
index f4e9ff9b..8ed46323 100644
--- a/test/test_console_search.py
+++ b/test/test_console_search.py
@@ -1,8 +1,10 @@
+import os
+from nose.plugins.skip import SkipTest
+if os.name == "nt":
+ raise SkipTest("Skipped on Windows.")
-import sys
-import libmproxy.console.contentview as cv
-from libmproxy import utils, flow, encoding
import tutils
+import libmproxy.console.contentview as cv
def test_search_highlights():
# Default text in requests is content. We will search for nt once, and