diff options
Diffstat (limited to 'tests/hub_test.py')
| -rw-r--r-- | tests/hub_test.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/hub_test.py b/tests/hub_test.py index 65ba0a9..9b97cb0 100644 --- a/tests/hub_test.py +++ b/tests/hub_test.py @@ -1,9 +1,7 @@ -from __future__ import with_statement import sys import time import tests -from tests import skip_with_pyevent, skip_if_no_itimer, skip_unless from tests.patcher_test import ProcessBase import eventlet from eventlet import hubs @@ -20,7 +18,6 @@ def noop(): class TestTimerCleanup(tests.LimitedTestCase): TEST_TIMEOUT = 2 - @skip_with_pyevent def test_cancel_immediate(self): hub = hubs.get_hub() stimers = hub.get_timers_count() @@ -34,7 +31,6 @@ class TestTimerCleanup(tests.LimitedTestCase): self.assert_less_than_equal(hub.get_timers_count(), 1000 + stimers) self.assert_less_than_equal(hub.timers_canceled, 1000) - @skip_with_pyevent def test_cancel_accumulated(self): hub = hubs.get_hub() stimers = hub.get_timers_count() @@ -51,7 +47,6 @@ class TestTimerCleanup(tests.LimitedTestCase): self.assert_less_than_equal(hub.get_timers_count(), 1000 + stimers) self.assert_less_than_equal(hub.timers_canceled, 1000) - @skip_with_pyevent def test_cancel_proportion(self): # if fewer than half the pending timers are canceled, it should # not clean them out @@ -149,7 +144,7 @@ class TestExceptionInMainloop(tests.LimitedTestCase): class TestExceptionInGreenthread(tests.LimitedTestCase): - @skip_unless(greenlets.preserves_excinfo) + @tests.skip_unless(greenlets.preserves_excinfo) def test_exceptionpreservation(self): # events for controlling execution order gt1event = eventlet.Event() @@ -218,7 +213,6 @@ class TestHubSelection(tests.LimitedTestCase): class TestHubBlockingDetector(tests.LimitedTestCase): TEST_TIMEOUT = 10 - @skip_with_pyevent def test_block_detect(self): def look_im_blocking(): import time @@ -229,8 +223,7 @@ class TestHubBlockingDetector(tests.LimitedTestCase): self.assertRaises(RuntimeError, gt.wait) debug.hub_blocking_detection(False) - @skip_with_pyevent - @skip_if_no_itimer + @tests.skip_if_no_itimer def test_block_detect_with_itimer(self): def look_im_blocking(): import time @@ -295,7 +288,6 @@ def test_repeated_select_bad_fd(): once() -@skip_with_pyevent def test_fork(): tests.run_isolated('hub_fork.py') |