diff options
| author | Todd Fiala <todd.fiala@gmail.com> | 2016-04-19 04:20:35 +0000 |
|---|---|---|
| committer | Todd Fiala <todd.fiala@gmail.com> | 2016-04-19 04:20:35 +0000 |
| commit | ca5793ea5c49842bc234b45a88467fd74667573b (patch) | |
| tree | 10d115d802e30bdd8ad8ab7ac9d05b8b4e282775 /lldb/packages/Python/lldbsuite/test/dosep.py | |
| parent | 9695eb3239018647bcee02eba2f9f5b90904d1bc (diff) | |
| download | bcm5719-llvm-ca5793ea5c49842bc234b45a88467fd74667573b.tar.gz bcm5719-llvm-ca5793ea5c49842bc234b45a88467fd74667573b.zip | |
test infra cleanup: convert test_runner lib into package
Also does the following:
* adopts PEP8 naming convention for OptionalWith class (now
optional_with).
* moves test_runner/lldb_utils.py to lldbsuite/support/optional_with.py.
* packages tests in a subpackage of test_runner per recommendations in
http://the-hitchhikers-guide-to-packaging.readthedocs.org/en/latest/creation.html
Tests can be run from within pacakges/Python/lldbsuite/test via this
command:
python -m unittest discover test_runner
The primary cleanup this allows is avoiding the need to muck with the
PYTHONPATH variable from within the source files. This also aids some
of the static code checkers as they don't need to run code to determine
the proper python path.
llvm-svn: 266710
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dosep.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index 69e85bdd9e3..e58bcaf9574 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -52,6 +52,7 @@ from six.moves import queue import lldbsuite import lldbsuite.support.seven as seven +from lldbsuite.support import optional_with from . import configuration from . import dotest_channels from . import dotest_args @@ -59,12 +60,7 @@ from . import result_formatter from .result_formatter import EventBuilder - -# Todo: Convert this folder layout to be relative-import friendly and -# don't hack up sys.path like this -sys.path.append(os.path.join(os.path.dirname(__file__), "test_runner", "lib")) -import lldb_utils -import process_control +from .test_runner import process_control # Status codes for running command with timeout. eTimedOut, ePassed, eFailed = 124, 0, 1 @@ -177,7 +173,7 @@ class DoTestProcessDriver(process_control.ProcessDriver): super(DoTestProcessDriver, self).__init__( soft_terminate_timeout=soft_terminate_timeout) self.output_file = output_file - self.output_lock = lldb_utils.OptionalWith(output_file_lock) + self.output_lock = optional_with.optional_with(output_file_lock) self.pid_events = pid_events self.results = None self.file_name = file_name |
