[Bf-blender-cvs] [ea55af21639] blender2.8: tests: replace boiler-plate with util function

Campbell Barton noreply at git.blender.org
Thu Jan 4 01:23:03 CET 2018


Commit: ea55af216393bb0f54c6cf20ec3ef2293f2032b1
Author: Campbell Barton
Date:   Thu Jan 4 11:28:46 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBea55af216393bb0f54c6cf20ec3ef2293f2032b1

tests: replace boiler-plate with util function

This crept back in somehow!

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

M	tests/python/view_layer/test_scene_collection_delete.py
M	tests/python/view_layer/test_scene_copy_f.py
M	tests/python/view_layer/test_scene_delete.py
M	tests/python/view_layer/test_scene_objects.py

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

diff --git a/tests/python/view_layer/test_scene_collection_delete.py b/tests/python/view_layer/test_scene_collection_delete.py
index 3f917e5a35c..58893810545 100644
--- a/tests/python/view_layer/test_scene_collection_delete.py
+++ b/tests/python/view_layer/test_scene_collection_delete.py
@@ -45,10 +45,5 @@ class UnitTesting(ViewLayerTesting):
 # ############################################################
 
 if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
+    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
     unittest.main()
diff --git a/tests/python/view_layer/test_scene_copy_f.py b/tests/python/view_layer/test_scene_copy_f.py
index f97eec3b98a..13586a66f3d 100644
--- a/tests/python/view_layer/test_scene_copy_f.py
+++ b/tests/python/view_layer/test_scene_copy_f.py
@@ -85,10 +85,5 @@ class UnitTesting(ViewLayerTesting):
 # ############################################################
 
 if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
+    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
     unittest.main()
diff --git a/tests/python/view_layer/test_scene_delete.py b/tests/python/view_layer/test_scene_delete.py
index 4e63b9698b9..edc997d6495 100644
--- a/tests/python/view_layer/test_scene_delete.py
+++ b/tests/python/view_layer/test_scene_delete.py
@@ -30,10 +30,5 @@ class UnitTesting(ViewLayerTesting):
 # ############################################################
 
 if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
+    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
     unittest.main()
diff --git a/tests/python/view_layer/test_scene_objects.py b/tests/python/view_layer/test_scene_objects.py
index 3fae126f206..c5d3a0196ed 100644
--- a/tests/python/view_layer/test_scene_objects.py
+++ b/tests/python/view_layer/test_scene_objects.py
@@ -49,10 +49,5 @@ class UnitTesting(ViewLayerTesting):
 # ############################################################
 
 if __name__ == '__main__':
-    import sys
-
-    extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
-    sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
-
-    UnitTesting._extra_arguments = extra_arguments
+    UnitTesting._extra_arguments = setup_extra_arguments(__file__)
     unittest.main()



More information about the Bf-blender-cvs mailing list