aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-11-24 19:05:37 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-11-24 19:07:04 +0100
commit354f84c4c8a1ae83e63bf6ce8430c62e8e4463fd (patch)
tree308ed772c8e0b416a0a9245c37f80855a72840dd /test/tutils.py
parentd2f69da23545db7b081cfd45785da4dd2eb76590 (diff)
downloadmitmproxy-354f84c4c8a1ae83e63bf6ce8430c62e8e4463fd.tar.gz
mitmproxy-354f84c4c8a1ae83e63bf6ce8430c62e8e4463fd.tar.bz2
mitmproxy-354f84c4c8a1ae83e63bf6ce8430c62e8e4463fd.zip
skip timing tests on appveyor
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py
index cc8c407f..8f92b596 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -15,13 +15,24 @@ from libmproxy.models import (
)
-def _SkipWindows(*args):
+def _skip_windows(*args):
raise SkipTest("Skipped on Windows.")
-def SkipWindows(fn):
+def skip_windows(fn):
if os.name == "nt":
- return _SkipWindows
+ return _skip_windows
+ else:
+ return fn
+
+
+def _skip_appveyor(*args):
+ raise SkipTest("Skipped on AppVeyor.")
+
+
+def skip_appveyor(fn):
+ if "APPVEYOR" in os.environ:
+ return _skip_appveyor
else:
return fn