diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 17:19:47 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 17:19:47 +0100 |
| commit | 2e50b1073538730fc5bd6369e2cb8176874f2f03 (patch) | |
| tree | e7b9e8305f6d96faf6a5189efa1c93f3baf0634e | |
| parent | 2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (diff) | |
| download | mitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.tar.gz mitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.tar.bz2 mitmproxy-2e50b1073538730fc5bd6369e2cb8176874f2f03.zip | |
fix windows tests, include improvements from 0.10.1
| -rw-r--r-- | libmproxy/version.py | 1 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test/test_console_search.py | 8 |
4 files changed, 8 insertions, 5 deletions
diff --git a/libmproxy/version.py b/libmproxy/version.py index 8df95c6e..1f3289cf 100644 --- a/libmproxy/version.py +++ b/libmproxy/version.py @@ -1,4 +1,5 @@ IVERSION = (0, 11) VERSION = ".".join(str(i) for i in IVERSION) +MINORVERSION = ".".join(str(i) for i in IVERSION[:1]) NAME = "mitmproxy" NAMEVERSION = NAME + " " + VERSION diff --git a/requirements.txt b/requirements.txt index fde84677..8c03d364 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ Werkzeug>=0.8.3 lxml>=3.2.1 netlib>=0.10 pathod>=0.9.2 -pyOpenSSL>=0.13 +pyOpenSSL>=0.14 pyasn1>=0.1.7 requests>=1.2.2 urwid>=1.1.1 @@ -99,7 +99,7 @@ setup( "Topic :: Software Development :: Testing" ], install_requires=[ - "netlib>=%s"%version.VERSION, + "netlib>=%s"%version.MINORVERSION, "urwid>=1.1", "pyasn1>0.1.2", "pyopenssl>=0.14", 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 |