[Bf-blender-cvs] [d0af31b317c] id_copy_refactor: Fix T51762: Unit test script_alembic_import is failing.
Sybren A. Stüvel
noreply at git.blender.org
Tue Jun 20 17:56:45 CEST 2017
Commit: d0af31b317c6e2fb98f56c085fcd7366bc57938a
Author: Sybren A. Stüvel
Date: Mon Jun 19 17:50:43 2017 +0200
Branches: id_copy_refactor
https://developer.blender.org/rBd0af31b317c6e2fb98f56c085fcd7366bc57938a
Fix T51762: Unit test script_alembic_import is failing.
Implemented workaround for use with the legacy depsgraph.
===================================================================
M tests/python/CMakeLists.txt
M tests/python/bl_alembic_import_test.py
===================================================================
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index d4326d48d6d..9e1ebcbe669 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -474,6 +474,7 @@ if(WITH_ALEMBIC)
--python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
--
--testdir "${TEST_SRC_DIR}/alembic"
+ --with-legacy-depsgraph=${WITH_LEGACY_DEPSGRAPH}
)
else()
@@ -487,6 +488,7 @@ if(WITH_ALEMBIC)
--python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
--
--testdir "${TEST_SRC_DIR}/alembic"
+ --with-legacy-depsgraph=${WITH_LEGACY_DEPSGRAPH}
)
endif()
diff --git a/tests/python/bl_alembic_import_test.py b/tests/python/bl_alembic_import_test.py
index 0e7257d30b9..d8cd64a1d56 100644
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@ -129,6 +129,9 @@ class SimpleImportTest(AbstractAlembicTest):
bpy.data.cache_files[fname].filepath = relpath.replace('1.abc', '2.abc')
bpy.context.scene.update()
+ if args.with_legacy_depsgraph:
+ bpy.context.scene.frame_set(10)
+
x, y, z = cube.matrix_world.to_euler('XYZ')
self.assertAlmostEqual(x, math.pi / 2, places=5)
self.assertAlmostEqual(y, 0)
@@ -213,6 +216,8 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument('--testdir', required=True, type=pathlib.Path)
+ parser.add_argument('--with-legacy-depsgraph', default=False,
+ type=lambda v: v in {'ON', 'YES', 'TRUE'})
args, remaining = parser.parse_known_args(argv)
unittest.main(argv=remaining)
More information about the Bf-blender-cvs
mailing list