openstack
/
futurist
Code Issues Proposed changes

Fix time related check in rejection test 

Instead of using time functions to delay submissions
to validate that rejection fails use an event instead
and use it to force the needed threads to block up so
that rejection will always happen (even with time
changes).

Closes-bug: #1552232

Change-Id: Ib688dccd8eda8c11b71b4aa36904ee67d2f93889
This commit is contained in:
Joshua Harlow 2016-03-02 13:58:12 -08:00
parent 81991b6a09
commit 9c41f41698
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
futurist/tests/test_executors.py
View File

@ -12,8 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import threading
import time
from eventlet.green import threading as green_threading
import testscenarios
from testtools import testcase
@ -140,29 +142,41 @@ class TestExecutors(testscenarios.TestWithScenarios, base.TestCase):
self.assertEqual(5, len(happy_completed))
_REJECTION = rejection.reject_when_reached(1)
class TestRejection(testscenarios.TestWithScenarios, base.TestCase):
rejector = rejection.reject_when_reached(1)
scenarios = [
('green', {'executor_cls': futurist.GreenThreadPoolExecutor,
'executor_kwargs': {'check_and_reject': _REJECTION,
'max_workers': 1}}),
'executor_kwargs': {'check_and_reject': rejector,
'max_workers': 1},
'event_cls': green_threading.Event}),
('thread', {'executor_cls': futurist.ThreadPoolExecutor,
'executor_kwargs': {'check_and_reject': _REJECTION,
'max_workers': 1}}),
'executor_kwargs': {'check_and_reject': rejector,
'max_workers': 1},
'event_cls': threading.Event}),
]
def setUp(self):
super(TestRejection, self).setUp()
self.executor = self.executor_cls(**self.executor_kwargs)
self.addCleanup(self.executor.shutdown, wait=True)
def test_rejection(self):
self.addCleanup(self.executor.shutdown)
ev = self.event_cls()
ev_thread_started = self.event_cls()
self.addCleanup(ev.set)
def wait_until_set(check_delay):
ev_thread_started.set()
while not ev.is_set():
ev.wait(check_delay)
# 1 worker + 1 item of backlog
for _i in range(2):
self.executor.submit(delayed, 0.5)
self.executor.submit(wait_until_set, 0.1)
# ensure the above thread has started before doing anything
# else.
ev_thread_started.wait()
self.executor.submit(wait_until_set, 0.1)
self.assertRaises(futurist.RejectedSubmission,
self.executor.submit, returns_one)