[Bf-blender-cvs] [872065e] blender-v2.78-release: Fix undefined variable on errors in Cycles ctests.
Dmitry Dygalo
noreply at git.blender.org
Wed Sep 14 10:38:48 CEST 2016
Commit: 872065e19e3fce16b4af04bd701cc9645a943ad5
Author: Dmitry Dygalo
Date: Sat Sep 10 22:55:28 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB872065e19e3fce16b4af04bd701cc9645a943ad5
Fix undefined variable on errors in Cycles ctests.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2201
===================================================================
M tests/python/cycles_render_tests.py
===================================================================
diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py
index fb9a4b3..78b4b34 100755
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -38,11 +38,11 @@ def render_file(filepath):
elif b"blender probably wont start" in e.output:
return "NO_START"
return "CRASH"
- except:
+ except BaseException as e:
if os.path.exists(TEMP_FILE):
os.remove(TEMP_FILE)
if VERBOSE:
- print(e.output.decode("utf-8"))
+ print(e)
return "CRASH"
More information about the Bf-blender-cvs
mailing list