Merge branch 'blender-v5.2-release'

tests/python/bl_node_copy_operators.py

@@ -10,6 +10,9 @@ from mathutils import Vector
 
 import bpy
 
+# To update the test data, set the `BLENDER_TEST_UPDATE` environment variable:
+# `BLENDER_TEST_UPDATE=1 ctest -R bl_node_copy_operators`
+#
 # Test cases listed below must have a test data in the "Tests" node group in the main test file.
 # Each test case should have a frame node whose content is used as input for operators.
 # Nodes labeled "external" are excluded from the grouping operator to test external links.
@@ -27,13 +30,6 @@ import bpy
 #   - bpy.data.node_groups["ExpectedUngroup"]:              Result of node.ungroup operator.
 #   - bpy.data.node_groups["ExpectedGroupSeparateCopy"]:    Result of node.group_separate operator with type='COPY'.
 #   - bpy.data.node_groups["ExpectedGroupSeparateMove"]:    Result of node.group_separate operator with type='MOVE'.
-#
-# The script can be invoked with an additional argument '--generate' to update the ground truth test data.
-# Nodes in the "Expected***" node trees are replaced with the result of operators applied to the "Tests" node tree.
-#
-# ./bin/blender --factory-startup --python <SOURCEPATH>/tests/python/bl_node_copy_operators.py
-#     --
-#     --testdir <SOURCEPATH>/tests/files/node_group --generate
 
 args = None
 testfile = "node_copy_operators.blend"
@@ -65,6 +61,7 @@ all_test_cases = [
     ('test_insert_group_with_sockets', {'GROUP_INSERT'}),
     ('test_ungroup_multiple', {'NODE_GROUP'}),
     ('test_ungroup_proxy_nodes', {'NODE_GROUP'}),
+    ('test_viewer_node', {}),
 ]
 
 
@@ -404,7 +401,6 @@ class AbstractNodeCopyOperatorTest(unittest.TestCase):
         self.assertTrue(args.testdir.exists(),
                         'Test dir {0} should exist'.format(args.testdir))
         open_test_file()
-        self.assertEqual(bpy.data.version, (5, 2, 5))
 
     def tearDown(self):
         self._tempdir.cleanup()
@@ -632,6 +628,7 @@ def generate_test_data():
 def main():
     global args
     import argparse
+    import os
 
     if '--' in sys.argv:
         argv = [sys.argv[0]] + sys.argv[sys.argv.index('--') + 1:]
@@ -640,17 +637,13 @@ def main():
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--testdir', required=True, type=pathlib.Path)
-    parser.add_argument(
-        '--generate',
-        action='store_true',
-        help="Generate ground truth test data instead of running the test")
     parser.add_argument('--subtest', default=None, help="Select a single test case")
     args, remaining = parser.parse_known_args(argv)
 
-    if args.generate:
+    if os.getenv("BLENDER_TEST_UPDATE") is not None:
         generate_test_data()
-    else:
-        unittest.main(argv=remaining)
+
+    unittest.main(argv=remaining)
 
 
 if __name__ == "__main__":