diff options
author | William Deegan <bill@baddogconsulting.com> | 2022-06-14 01:03:46 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2022-06-14 01:03:46 (GMT) |
commit | 32936b08e4aa969d76aedd2d8353bdacb03f1547 (patch) | |
tree | 7ee07aa4edf0b3779a5db8c22ae49464610f2019 /testing/framework | |
parent | 2a853ac85704a8e72d7d57d3aa0c7a7ed4edd48a (diff) | |
download | SCons-32936b08e4aa969d76aedd2d8353bdacb03f1547.zip SCons-32936b08e4aa969d76aedd2d8353bdacb03f1547.tar.gz SCons-32936b08e4aa969d76aedd2d8353bdacb03f1547.tar.bz2 |
Fixed some typos. Added skip_test() if psutil is not present for new test. Added note to CHANGES.txt/RELEASE.txt that psutil is required for the new test for this function
Diffstat (limited to 'testing/framework')
-rw-r--r-- | testing/framework/TestCmd.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py index e0af333..18a0db4 100644 --- a/testing/framework/TestCmd.py +++ b/testing/framework/TestCmd.py @@ -386,7 +386,12 @@ def _caller(tblist, skip): atfrom = "\tfrom" return string + def clean_up_ninja_daemon(self, result_type): + """ + Kill any running scons daemon started by ninja and clean up it's working dir and + temp files. + """ if self: for path in Path(self.workdir).rglob('.ninja'): daemon_dir = Path(tempfile.gettempdir()) / ( @@ -412,6 +417,7 @@ def clean_up_ninja_daemon(self, result_type): if daemon_dir.exists(): shutil.rmtree(daemon_dir) + def fail_test(self=None, condition=True, function=None, skip=0, message=None): """Causes a test to exit with a fail. |