[Bf-blender-cvs] [24a401c36d1] soc-2021-geometry-nodes-regression-test: Changes based on review by Habib Gahbiche

[Himanshi Kalra]

Commit: 24a401c36d1da64580cbb1b33c7c1d5c3d8d2c3f
Author: Himanshi Kalra
Date:   Thu Jun 17 11:12:27 2021 +0530
Branches: soc-2021-geometry-nodes-regression-test
https://developer.blender.org/rB24a401c36d1da64580cbb1b33c7c1d5c3d8d2c3f

Changes based on review by Habib Gahbiche

Removed global variable FILE UPDATE COUNT, introduced a function
run_test().

===================================================================

M	tests/python/geo_node_test.py

===================================================================

diff --git a/tests/python/geo_node_test.py b/tests/python/geo_node_test.py
index 55002ee9585..a5f94fa4da7 100644
--- a/tests/python/geo_node_test.py
+++ b/tests/python/geo_node_test.py
@@ -41,8 +41,6 @@ import bpy
 import os
 import sys
 
-FILE_UPDATE_COUNT = 0
-
 
 def get_test_object():
     """
@@ -144,17 +142,11 @@ def failed_test(evaluated_object, expected_object, result):
 
     update_expected_object(evaluated_object, expected_object)
     print("Re-running the test...")
-    if FILE_UPDATE_COUNT < 2:
-        main()
-    else:
-        print("The script has run into some errors. Test cannot pass. Exiting...")
-        sys.exit(1)
+    run_test()
 
 
 def update_expected_object(evaluated_object, expected_object):
     print("Updating the test...")
-    global FILE_UPDATE_COUNT
-    FILE_UPDATE_COUNT += 1
     evaluated_object.location = expected_object.location
     expected_object_name = expected_object.name
     bpy.data.objects.remove(expected_object, do_unlink=True)
@@ -179,6 +171,13 @@ def duplicate_test_object(test_object):
     return evaluated_object
 
 
+def run_test():
+    test_object = get_test_object()
+    expected_object = get_expected_object()
+    evaluated_object = get_evaluated_object(test_object)
+    compare_meshes(evaluated_object, expected_object)
+
+
 def main():
     """
     Main function controlling the workflow and running the tests.
@@ -187,9 +186,7 @@ def main():
     update_test_flag = os.getenv('BLENDER_TEST_UPDATE') is not None
     if update_test_flag:
         create_expected_object(test_object)
-    expected_object = get_expected_object()
-    evaluated_object = get_evaluated_object(test_object)
-    compare_meshes(evaluated_object, expected_object)
+    run_test()
 
 
 if __name__ == "__main__":