Skip to content
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

Remove context behavior of base_test #616

Merged
merged 2 commits into from
Aug 7, 2019
Merged

Remove context behavior of base_test #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbdf60c
Remove deprecated method.
xpconanfan Aug 7, 2019
8200b97
Remove context behavior of `base_test` as it has not been doing
xpconanfan Aug 7, 2019
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
21 changes: 0 additions & 21 deletions mobly/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ def __init__(self, configs):
class_name=self.TAG, controller_configs=configs.controller_configs)
self.controller_configs = self._controller_manager.controller_configs

def __enter__(self):
return self

def __exit__(self, *args):
self._safe_exec_func(self.clean_up)

def unpack_userparams(self,
req_param_names=None,
opt_param_names=None,
Expand Down Expand Up @@ -874,18 +868,3 @@ def _clean_up(self):
self.results.add_class_error(record)
self.summary_writer.dump(record.to_dict(),
records.TestSummaryEntryType.RECORD)

def clean_up(self):
""".. deprecated:: 1.8.1

Use `teardown_class` instead.

A function that is executed upon completion of all tests selected in
the test class.

This function should clean up objects initialized in the constructor by
user.

Generally this should not be used as nothing should be instantiated
from the constructor of a test class.
"""
20 changes: 11 additions & 9 deletions mobly/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,12 @@ class TestRunner(object):
self.results: The test result object used to record the results of
this test run.
"""

class _TestRunInfo(object):
"""Identifies one test class to run, which tests to run, and config to
run it with.
"""

def __init__(self,
config,
test_class,
Expand Down Expand Up @@ -294,15 +296,15 @@ def _run_test_class(self, config, test_class, tests=None):
test_class: class, test class to execute.
tests: Optional list of test names within the class to execute.
"""
with test_class(config) as test_instance:
logging.debug('Executing test class "%s" with config: %s',
test_class.__name__, config)
try:
cls_result = test_instance.run(tests)
self.results += cls_result
except signals.TestAbortAll as e:
self.results += e.results
raise e
test_instance = test_class(config)
logging.debug('Executing test class "%s" with config: %s',
test_class.__name__, config)
try:
cls_result = test_instance.run(tests)
self.results += cls_result
except signals.TestAbortAll as e:
self.results += e.results
raise e

def run(self):
"""Executes tests.
Expand Down