Skip to content

Preserve setup error records when failure handling aborts #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rksharma-owg wants to merge 1 commit into
base: master
Choose a base branch
from
+55 −12
Open

Preserve setup error records when failure handling aborts #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions mobly/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,21 +416,25 @@ def _setup_class(self):
logging.exception('Error in %s#setup_class.', self.TAG)
class_record.test_error(e)
self.results.add_class_error(class_record)
self._exec_procedure_func(self._on_fail, class_record)
class_record.update_record()
self.summary_writer.dump(
class_record.to_dict(), records.TestSummaryEntryType.RECORD
)
try:
self._exec_procedure_func(self._on_fail, class_record)
finally:
class_record.update_record()
self.summary_writer.dump(
class_record.to_dict(), records.TestSummaryEntryType.RECORD
)
self._skip_remaining_tests(e)
return self.results
if expects.recorder.has_error:
self._exec_procedure_func(self._on_fail, class_record)
class_record.test_error()
class_record.update_record()
self.summary_writer.dump(
class_record.to_dict(), records.TestSummaryEntryType.RECORD
)
self.results.add_class_error(class_record)
try:
self._exec_procedure_func(self._on_fail, class_record)
finally:
class_record.test_error()
class_record.update_record()
self.summary_writer.dump(
class_record.to_dict(), records.TestSummaryEntryType.RECORD
)
self.results.add_class_error(class_record)
self._skip_remaining_tests(class_record.termination_signal.exception)
return self.results

Expand Down
39 changes: 39 additions & 0 deletions tests/mobly/base_test_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,6 +1375,45 @@ def on_fail(self, record):
'Error 1, Executed 0, Failed 0, Passed 0, Requested 3, Skipped 3',
)

with open(self.summary_file) as summary:
setup_records = [
entry
for entry in yaml.safe_load_all(summary)
if entry.get('Test Name') == 'setup_class'
]
self.assertEqual(len(setup_records), 1)
self.assertEqual(setup_records[0]['Result'], 'ERROR')
self.assertEqual(setup_records[0]['Details'], MSG_UNEXPECTED_EXCEPTION)
self.assertIsNotNone(setup_records[0]['End Time'])

def test_abort_all_in_on_fail_from_setup_class_expect(self):
class MockBaseTest(base_test.BaseTestClass):

def setup_class(self):
expects.expect_true(False, MSG_UNEXPECTED_EXCEPTION)

def test_1(self):
never_call()

def on_fail(self, record):
asserts.abort_all(MSG_EXPECTED_EXCEPTION)

bt_cls = MockBaseTest(self.mock_test_cls_configs)
with self.assertRaisesRegex(signals.TestAbortAll, MSG_EXPECTED_EXCEPTION):
bt_cls.run(test_names=['test_1'])
self.assertEqual(len(bt_cls.results.error), 1)
self.assertEqual(len(bt_cls.results.skipped), 1)
with open(self.summary_file) as summary:
setup_records = [
entry
for entry in yaml.safe_load_all(summary)
if entry.get('Test Name') == 'setup_class'
]
self.assertEqual(len(setup_records), 1)
self.assertEqual(setup_records[0]['Result'], 'ERROR')
self.assertEqual(setup_records[0]['Details'], MSG_UNEXPECTED_EXCEPTION)
self.assertIsNotNone(setup_records[0]['End Time'])

def test_abort_all_in_test(self):
class MockBaseTest(base_test.BaseTestClass):

Expand Down