openstack
/
futurist
Code Issues Proposed changes

Merge "Fix wrong comparison in reject_when_reached"

This commit is contained in:
Jenkins 2016-02-22 08:02:38 +00:00 committed by Gerrit Code Review
parent d750d05b7b 6a2f5a0bb3
commit 76d9eb76bc
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
futurist/rejection.py
View File

@ -23,7 +23,7 @@ def reject_when_reached(max_backlog):
"""Returns a function that will raise when backlog goes past max size."""
def _rejector(executor, backlog):
if backlog + 1 >= max_backlog:
if backlog >= max_backlog:
raise futurist.RejectedSubmission("Current backlog %s is not"
" allowed to go"
" beyond %s" % (backlog,

29
futurist/tests/test_executors.py
View File

@ -18,6 +18,7 @@ import testscenarios
from testtools import testcase
import futurist
from futurist import rejection
from futurist.tests import base
@ -137,3 +138,31 @@ class TestExecutors(testscenarios.TestWithScenarios, base.TestCase):
self.assertEqual(10, len(happy_completed) + len(unhappy_completed))
self.assertEqual(5, len(unhappy_completed))
self.assertEqual(5, len(happy_completed))
_REJECTION = rejection.reject_when_reached(1)
class TestRejection(testscenarios.TestWithScenarios, base.TestCase):
scenarios = [
('green', {'executor_cls': futurist.GreenThreadPoolExecutor,
'executor_kwargs': {'check_and_reject': _REJECTION,
'max_workers': 1}}),
('thread', {'executor_cls': futurist.ThreadPoolExecutor,
'executor_kwargs': {'check_and_reject': _REJECTION,
'max_workers': 1}}),
]
def setUp(self):
super(TestRejection, self).setUp()
self.executor = self.executor_cls(**self.executor_kwargs)
def test_rejection(self):
self.addCleanup(self.executor.shutdown)
# 1 worker + 1 item of backlog
for _i in range(2):
self.executor.submit(delayed, 0.5)
self.assertRaises(futurist.RejectedSubmission,
self.executor.submit, returns_one)