Skip to content

Commit

Permalink
Increase running time for timed out task in a unit test.
Browse files Browse the repository at this point in the history
Running time for timing-out task increased to 100 seconds, this should
reduce the chance for it to finish successfully before timeout is
detected by a parent.
  • Loading branch information
andy-slac committed Mar 16, 2022
1 parent 3769d20 commit 19f7295
Showing 1 changed file with 14 additions and 24 deletions.
38 changes: 14 additions & 24 deletions tests/test_executors.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,16 +189,6 @@ def runQuantum(self):
signal.raise_signal(signal.SIGILL)


class TaskMockSleep:
"""Simple mock class for task which "runs" for some time."""

canMultiprocess = True

def runQuantum(self):
_LOG.debug("TaskMockSleep.runQuantum")
time.sleep(5.0)


class TaskMockLongSleep:
"""Simple mock class for task which "runs" for very long time."""

Expand Down Expand Up @@ -330,7 +320,7 @@ def test_mpexec_timeout(self):
"""Fail due to timeout"""

taskDef = TaskDefMock()
taskDefSleep = TaskDefMock(taskClass=TaskMockSleep)
taskDefSleep = TaskDefMock(taskClass=TaskMockLongSleep)
qgraph = QuantumGraphMock(
[
QuantumIterDataMock(index=0, taskDef=taskDef, detector=0),
Expand All @@ -348,7 +338,7 @@ def test_mpexec_timeout(self):
self.assertEqual(report.status, ExecutionStatus.TIMEOUT)
self.assertEqual(report.exceptionInfo.className, "lsst.ctrl.mpexec.mpGraphExecutor.MPTimeoutError")
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.TIMEOUT), 1)
self.assertEqual(_count_status(report, ExecutionStatus.TIMEOUT), 1)
self.assertTrue(any(qrep.exitCode < 0 for qrep in report.quantaReports))
self.assertTrue(all(qrep.exceptionInfo is None for qrep in report.quantaReports))

Expand Down Expand Up @@ -396,8 +386,8 @@ def test_mpexec_failure(self):
report.exceptionInfo.className, "lsst.ctrl.mpexec.mpGraphExecutor.MPGraphExecutorError"
)
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEquals(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertTrue(any(qrep.exitCode > 0 for qrep in report.quantaReports))
self.assertTrue(any(qrep.exceptionInfo is not None for qrep in report.quantaReports))

Expand Down Expand Up @@ -431,9 +421,9 @@ def test_mpexec_failure_dep(self):
)
# Dependencies of failed tasks do not appear in quantaReports
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEquals(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEquals(_count_status(report, ExecutionStatus.SKIPPED), 2)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEqual(_count_status(report, ExecutionStatus.SKIPPED), 2)
self.assertTrue(any(qrep.exitCode > 0 for qrep in report.quantaReports))
self.assertTrue(any(qrep.exceptionInfo is not None for qrep in report.quantaReports))

Expand Down Expand Up @@ -467,9 +457,9 @@ def test_mpexec_failure_dep_nomp(self):
)
# Dependencies of failed tasks do not appear in quantaReports
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEquals(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEquals(_count_status(report, ExecutionStatus.SKIPPED), 2)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEqual(_count_status(report, ExecutionStatus.SKIPPED), 2)
self.assertTrue(all(qrep.exitCode is None for qrep in report.quantaReports))
self.assertTrue(any(qrep.exceptionInfo is not None for qrep in report.quantaReports))

Expand Down Expand Up @@ -509,7 +499,7 @@ def test_mpexec_failure_failfast(self):
)
# Dependencies of failed tasks do not appear in quantaReports
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertTrue(any(qrep.exitCode > 0 for qrep in report.quantaReports))
self.assertTrue(any(qrep.exceptionInfo is not None for qrep in report.quantaReports))

Expand Down Expand Up @@ -537,8 +527,8 @@ def test_mpexec_crash(self):
)
# Dependencies of failed tasks do not appear in quantaReports
self.assertGreater(len(report.quantaReports), 0)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEquals(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.SUCCESS), 2)
self.assertTrue(any(qrep.exitCode == -signal.SIGILL for qrep in report.quantaReports))
self.assertTrue(all(qrep.exceptionInfo is None for qrep in report.quantaReports))

Expand All @@ -564,7 +554,7 @@ def test_mpexec_crash_failfast(self):
self.assertEqual(
report.exceptionInfo.className, "lsst.ctrl.mpexec.mpGraphExecutor.MPGraphExecutorError"
)
self.assertEquals(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertEqual(_count_status(report, ExecutionStatus.FAILURE), 1)
self.assertTrue(any(qrep.exitCode == -signal.SIGILL for qrep in report.quantaReports))
self.assertTrue(all(qrep.exceptionInfo is None for qrep in report.quantaReports))

Expand Down

0 comments on commit 19f7295

Please sign in to comment.