diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:49:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:50:14 +0300 |
commit | da53c3f02006b87e80ae898d1927a215b97cc934 (patch) | |
tree | f6c00c72822ad164586540a3602a20a3d4f9b6fb /tests/python/modules | |
parent | c8af234f855ccd29d042f5298f7dea05922a350e (diff) | |
parent | 58e8c71cbd91931f97607ab8b028624b3e90455e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests/python/modules')
-rwxr-xr-x | tests/python/modules/test_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/python/modules/test_utils.py b/tests/python/modules/test_utils.py index 55ef882c49c..c4496c3e3ac 100755 --- a/tests/python/modules/test_utils.py +++ b/tests/python/modules/test_utils.py @@ -61,7 +61,7 @@ class AbstractBlenderRunnerTest(unittest.TestCase): # Set in a subclass blender: pathlib.Path = None testdir: pathlib.Path = None - + def run_blender(self, filepath: str, python_script: str, timeout: int=300) -> str: """Runs Blender by opening a blendfile and executing a script. |