xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-40671: Fix parallel execution in resmoke

Browse Source
This commit is contained in:
David Bradford
2019-04-24 09:22:53 -04:00
parent 2392f37fec
commit 66fcbb20e5
5 changed files with 299 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
buildscripts/tests/resmokelib/testing/test_queue_element.py
View File

@@ -8,25 +8,44 @@ from buildscripts.resmokelib.testing import queue_element
# pylint: disable=missing-docstring,protected-access
class TestQueueElemRepeatNum(unittest.TestCase):
class TestQueueElemFactory(unittest.TestCase):
def test_without_time(self):
suite_options = mock.Mock()
suite_options.time_repeat_tests_secs = None
queue_elem = queue_element.queue_elem_factory(None, None, suite_options)
self.assertIsInstance(queue_elem, queue_element.QueueElem)
def test_with_time(self):
suite_options = mock.Mock()
suite_options.time_repeat_tests_secs = 5
queue_elem = queue_element.queue_elem_factory(None, None, suite_options)
self.assertIsInstance(queue_elem, queue_element.QueueElemRepeatTime)
class TestQueueElem(unittest.TestCase):
def test_norequeue(self):
suite_options = mock.Mock()
suite_options.num_repeat_tests = 1
queue_elem = queue_element.QueueElemRepeatNum(None, None, suite_options)
queue_elem.job_completed(1)
self.assertFalse(queue_elem.should_requeue())
def test_requeue(self):
suite_options = mock.Mock()
suite_options.num_repeat_tests = 2
queue_elem = queue_element.QueueElemRepeatNum(None, None, suite_options)
queue_elem.job_completed(1)
self.assertTrue(queue_elem.should_requeue())
queue_elem = queue_element.QueueElem(None, None, suite_options)
queue_elem.job_completed(1)
self.assertFalse(queue_elem.should_requeue())
class TestQueueElemRepeatTime(unittest.TestCase):
def assert_elem_queues_n_times(self, queue_elem, run_time, n_expected):
"""
Assert that the queue_elem should be requeued after a certain number of runs.
:param queue_elem: Element to test.
:param run_time: Runtime of each job execution.
:param n_expected: Number of times the job should be run.
"""
for _ in range(n_expected):
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(run_time)
self.assertFalse(queue_elem.should_requeue())
def test_requeue_time_only(self):
suite_options = mock.Mock()
suite_options.num_repeat_tests_min = None
@@ -34,10 +53,7 @@ class TestQueueElemRepeatTime(unittest.TestCase):
suite_options.time_repeat_tests_secs = 7
queue_elem = queue_element.QueueElemRepeatTime(None, None, suite_options)
job_time = 3
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertFalse(queue_elem.should_requeue())
self.assert_elem_queues_n_times(queue_elem, job_time, 3)
def test_should_requeue_time_exact_avg(self):
suite_options = mock.Mock()
@@ -46,12 +62,7 @@ class TestQueueElemRepeatTime(unittest.TestCase):
suite_options.time_repeat_tests_secs = 9
queue_elem = queue_element.QueueElemRepeatTime(None, None, suite_options)
job_time = 3
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertFalse(queue_elem.should_requeue())
self.assert_elem_queues_n_times(queue_elem, job_time, 3)
def test_should_requeue_time_with_min(self):
suite_options = mock.Mock()
@@ -60,12 +71,7 @@ class TestQueueElemRepeatTime(unittest.TestCase):
suite_options.time_repeat_tests_secs = 5
queue_elem = queue_element.QueueElemRepeatTime(None, None, suite_options)
job_time = 3
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertFalse(queue_elem.should_requeue())
self.assert_elem_queues_n_times(queue_elem, job_time, 3)
def test_should_requeue_time_with_max(self):
suite_options = mock.Mock()
@@ -74,10 +80,7 @@ class TestQueueElemRepeatTime(unittest.TestCase):
suite_options.time_repeat_tests_secs = 10
queue_elem = queue_element.QueueElemRepeatTime(None, None, suite_options)
job_time = 2
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertFalse(queue_elem.should_requeue())
self.assert_elem_queues_n_times(queue_elem, job_time, 2)
def test_should_requeue_time_with_min_max(self):
suite_options = mock.Mock()
@@ -86,7 +89,4 @@ class TestQueueElemRepeatTime(unittest.TestCase):
suite_options.time_repeat_tests_secs = 10
queue_elem = queue_element.QueueElemRepeatTime(None, None, suite_options)
job_time = 1
queue_elem.job_completed(job_time)
self.assertTrue(queue_elem.should_requeue())
queue_elem.job_completed(job_time)
self.assertFalse(queue_elem.should_requeue())
self.assert_elem_queues_n_times(queue_elem, job_time, 2)