From 4b37d13c34369c55b875c89ae658b6bd7b7effeb Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sun, 20 Mar 2016 22:23:07 -0700 Subject: [PATCH] tests/gevent: skip gevent monkey patch when running tests --- pywb/apps/conftest.py | 3 +++ pywb/apps/wayback.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 pywb/apps/conftest.py diff --git a/pywb/apps/conftest.py b/pywb/apps/conftest.py new file mode 100644 index 00000000..d5d4c959 --- /dev/null +++ b/pywb/apps/conftest.py @@ -0,0 +1,3 @@ +def pytest_configure(config): + import sys + sys._called_from_test = True diff --git a/pywb/apps/wayback.py b/pywb/apps/wayback.py index acdffffb..afedfbd6 100644 --- a/pywb/apps/wayback.py +++ b/pywb/apps/wayback.py @@ -1,8 +1,11 @@ -# Use gevent if available -try: - from gevent.monkey import patch_all; patch_all() -except Exception as e: - pass +import sys + +if not hasattr(sys, '_called_from_test'): #pragma: no cover + # Use gevent if available + try: + from gevent.monkey import patch_all; patch_all() + except Exception as e: + pass from pywb.framework.wsgi_wrappers import init_app from pywb.webapp.pywb_init import create_wb_router