diff --git a/tests/__init__.py b/tests/__init__.py index 852de9a8..348e1df8 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -58,3 +58,4 @@ def is_monkey_patched(): return is_gevent_monkey_patched() or is_eventlet_monkey_patched() notwindows = unittest.skipUnless(not "Windows" in platform.system(), "This test is not adequate for windows") +notpypy = unittest.skipUnless(not '__pypy__' in sys.builtin_module_names, "This tests is not suitable for pypy") diff --git a/tests/unit/io/test_eventletreactor.py b/tests/unit/io/test_eventletreactor.py index 761f9cf6..bfc7a528 100644 --- a/tests/unit/io/test_eventletreactor.py +++ b/tests/unit/io/test_eventletreactor.py @@ -19,8 +19,8 @@ except ImportError: import unittest # noqa from tests.unit.io.utils import TimerConnectionTests -from tests import is_eventlet_time_monkey_patched, is_gevent_time_monkey_patched from tests.unit.io.eventlet_utils import restore_saved_module +from tests import notpypy import time from eventlet import monkey_patch @@ -31,7 +31,9 @@ except ImportError: class EventletTimerTest(unittest.TestCase, TimerConnectionTests): + @notpypy def setUp(self): + #There are some issues with some versions of pypy and eventlet if not EventletConnection: raise unittest.SkipTest("Can't test eventlet without monkey patching") monkey_patch(time=True)