mirror of
https://github.com/blender/blender
synced 2026-09-27 01:34:15 +03:00
72f8c89b77
Initially noted by devops as a problem: UI tests when crashing spawn our crash dialog, that will just sit there for 1200 seconds until the CI environment decides the test has failed and kills the process, clicking away the dialog also works, but neither option is ideal here. The crash handler knows when we are in background mode, (`-B`) and suppresses this dialog so this is why it has not been an issue for the normal tests. However when we do crash we get an unhelpful message saying `Writing: blender.crash.txt` which is not collected by buildbot so unless a developer can get a devops person to go retrieve this file its contents will be left to ones imagination. This PR adds a `--console-crash-handler` argument that does two things: 1 - Suppress the crash dialog even when we are not in background mode 2 - Rather than writing the crash data to blender.crash.txt write this information to stderr so it shows up in the CI logs. It also updates all invocations of blender I could find in our test scripts to pass this new flag. The benchmark scripts have not been updated as they regularly run against older blender versions that may not support the new flag. Pull Request: https://projects.blender.org/blender/blender/pulls/159983
85 lines
2.5 KiB
Python
Executable file
85 lines
2.5 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
# SPDX-FileCopyrightText: 2018-2022 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
import functools
|
|
import shutil
|
|
import pathlib
|
|
import subprocess
|
|
import tempfile
|
|
import unittest
|
|
|
|
|
|
def with_tempdir(wrapped):
|
|
"""Creates a temporary directory for the function, cleaning up after it returns normally.
|
|
|
|
When the wrapped function raises an exception, the contents of the temporary directory
|
|
remain available for manual inspection.
|
|
|
|
The wrapped function is called with an extra positional argument containing
|
|
the pathlib.Path() of the temporary directory.
|
|
"""
|
|
|
|
@functools.wraps(wrapped)
|
|
def decorator(*args, **kwargs):
|
|
dirname = tempfile.mkdtemp(prefix='blender-alembic-test')
|
|
try:
|
|
retval = wrapped(*args, pathlib.Path(dirname), **kwargs)
|
|
except:
|
|
print('Exception in %s, not cleaning up temporary directory %s' % (wrapped, dirname))
|
|
raise
|
|
else:
|
|
shutil.rmtree(dirname)
|
|
return retval
|
|
|
|
return decorator
|
|
|
|
|
|
class AbstractBlenderRunnerTest(unittest.TestCase):
|
|
"""Base class for all test suites which needs to run Blender"""
|
|
|
|
# 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.
|
|
|
|
Returns Blender's stdout + stderr combined into one string.
|
|
|
|
:param filepath: taken relative to self.testdir.
|
|
:param timeout: in seconds
|
|
"""
|
|
|
|
assert self.blender, "Path to Blender binary is to be set in setUpClass()"
|
|
assert self.testdir, "Path to tests binary is to be set in setUpClass()"
|
|
|
|
blendfile = self.testdir / filepath if filepath else ""
|
|
|
|
command = [
|
|
self.blender,
|
|
'--background',
|
|
'--factory-startup',
|
|
'--enable-autoexec',
|
|
'--debug-memory',
|
|
'--console-crash-handler',
|
|
'--debug-exit-on-error',
|
|
]
|
|
|
|
if blendfile:
|
|
command.append(str(blendfile))
|
|
|
|
command.extend([
|
|
'--python-exit-code', '47',
|
|
'--python-expr', python_script,
|
|
]
|
|
)
|
|
|
|
proc = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
|
timeout=timeout)
|
|
output = proc.stdout.decode('utf8')
|
|
if proc.returncode:
|
|
self.fail('Error %d running Blender:\n%s' % (proc.returncode, output))
|
|
|
|
return output
|