Commit: 2ecb9856bc3a77354c9785a7119a0904d11e0d8c Author: Campbell Barton Date: Mon Jun 19 16:12:11 2017 +1000 Branches: blender2.8 https://developer.blender.org/rB2ecb9856bc3a77354c9785a7119a0904d11e0d8c
Cleanup: move copy-paste code into function =================================================================== M tests/python/render_layer/render_layer_common.py M tests/python/render_layer/test_active_collection.py M tests/python/render_layer/test_collection_rename.py M tests/python/render_layer/test_evaluation_render_settings_a.py M tests/python/render_layer/test_evaluation_render_settings_b.py M tests/python/render_layer/test_evaluation_render_settings_c.py M tests/python/render_layer/test_evaluation_render_settings_d.py M tests/python/render_layer/test_evaluation_render_settings_e.py M tests/python/render_layer/test_evaluation_render_settings_f.py M tests/python/render_layer/test_evaluation_render_settings_g.py M tests/python/render_layer/test_evaluation_render_settings_h.py M tests/python/render_layer/test_evaluation_render_settings_i.py M tests/python/render_layer/test_evaluation_selectability_a.py M tests/python/render_layer/test_evaluation_selectability_b.py M tests/python/render_layer/test_evaluation_selectability_c.py M tests/python/render_layer/test_evaluation_selectability_d.py M tests/python/render_layer/test_evaluation_selectability_e.py M tests/python/render_layer/test_evaluation_selectability_f.py M tests/python/render_layer/test_evaluation_visibility_a.py M tests/python/render_layer/test_evaluation_visibility_b.py M tests/python/render_layer/test_evaluation_visibility_c.py M tests/python/render_layer/test_evaluation_visibility_d.py M tests/python/render_layer/test_evaluation_visibility_e.py M tests/python/render_layer/test_evaluation_visibility_f.py M tests/python/render_layer/test_evaluation_visibility_g.py M tests/python/render_layer/test_evaluation_visibility_h.py M tests/python/render_layer/test_evaluation_visibility_i.py M tests/python/render_layer/test_layer_linking.py M tests/python/render_layer/test_layer_syncing.py M tests/python/render_layer/test_move_above_below_layer_collection_a.py M tests/python/render_layer/test_move_above_below_layer_collection_b.py M tests/python/render_layer/test_move_above_below_layer_collection_c.py M tests/python/render_layer/test_move_above_below_layer_collection_d.py M tests/python/render_layer/test_move_above_below_layer_collection_e.py M tests/python/render_layer/test_move_above_below_layer_collection_f.py M tests/python/render_layer/test_move_above_below_layer_collection_g.py M tests/python/render_layer/test_move_above_below_layer_collection_h.py M tests/python/render_layer/test_move_above_below_layer_collection_i.py M tests/python/render_layer/test_move_above_below_layer_collection_j.py M tests/python/render_layer/test_move_above_below_layer_collection_k.py M tests/python/render_layer/test_move_above_below_layer_collection_l.py M tests/python/render_layer/test_move_above_below_scene_collection_a.py M tests/python/render_layer/test_move_above_below_scene_collection_b.py M tests/python/render_layer/test_move_above_below_scene_collection_c.py M tests/python/render_layer/test_move_above_below_scene_collection_d.py M tests/python/render_layer/test_move_above_below_scene_collection_e.py M tests/python/render_layer/test_move_above_below_scene_collection_f.py M tests/python/render_layer/test_move_above_below_scene_collection_g.py M tests/python/render_layer/test_move_above_below_scene_collection_h.py M tests/python/render_layer/test_move_above_below_scene_collection_i.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py M tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py M tests/python/render_layer/test_move_into_layer_collection_a.py M tests/python/render_layer/test_move_into_layer_collection_b.py M tests/python/render_layer/test_move_into_layer_collection_c.py M tests/python/render_layer/test_move_into_layer_collection_d.py M tests/python/render_layer/test_move_into_layer_collection_e.py M tests/python/render_layer/test_move_into_layer_collection_f.py M tests/python/render_layer/test_move_into_layer_collection_g.py M tests/python/render_layer/test_move_into_layer_collection_h.py M tests/python/render_layer/test_move_into_layer_collection_i.py M tests/python/render_layer/test_move_into_layer_collection_j.py M tests/python/render_layer/test_move_into_scene_collection_a.py M tests/python/render_layer/test_move_into_scene_collection_b.py M tests/python/render_layer/test_move_into_scene_collection_c.py M tests/python/render_layer/test_move_into_scene_collection_d.py M tests/python/render_layer/test_move_into_scene_collection_e.py M tests/python/render_layer/test_move_into_scene_collection_f.py M tests/python/render_layer/test_move_into_scene_collection_g.py M tests/python/render_layer/test_move_into_scene_collection_h.py M tests/python/render_layer/test_move_into_scene_collection_i.py M tests/python/render_layer/test_move_into_scene_collection_j.py M tests/python/render_layer/test_move_into_scene_collection_k.py M tests/python/render_layer/test_move_into_scene_collection_l.py M tests/python/render_layer/test_move_into_scene_collection_sync_a.py M tests/python/render_layer/test_move_into_scene_collection_sync_b.py M tests/python/render_layer/test_move_into_scene_collection_sync_c.py M tests/python/render_layer/test_move_into_scene_collection_sync_d.py M tests/python/render_layer/test_move_into_scene_collection_sync_e.py M tests/python/render_layer/test_move_into_scene_collection_sync_f.py M tests/python/render_layer/test_move_into_scene_collection_sync_g.py M tests/python/render_layer/test_move_into_scene_collection_sync_h.py M tests/python/render_layer/test_move_into_scene_collection_sync_i.py M tests/python/render_layer/test_move_into_scene_collection_sync_j.py M tests/python/render_layer/test_move_into_scene_collection_sync_k.py M tests/python/render_layer/test_move_into_scene_collection_sync_l.py M tests/python/render_layer/test_object_add_cylinder.py M tests/python/render_layer/test_object_add_empty.py M tests/python/render_layer/test_object_add_no_collection_cylinder.py M tests/python/render_layer/test_object_add_no_collection_empty.py M tests/python/render_layer/test_object_add_no_collection_torus.py M tests/python/render_layer/test_object_add_torus.py M tests/python/render_layer/test_object_copy.py M tests/python/render_layer/test_object_delete_a.py M tests/python/render_layer/test_object_delete_b.py M tests/python/render_layer/test_object_link_a.py M tests/python/render_layer/test_object_link_b.py M tests/python/render_layer/test_object_link_c.py M tests/python/render_layer/test_operator_context.py M tests/python/render_layer/test_scene_copy_a.py M tests/python/render_layer/test_scene_copy_b.py M tests/python/render_layer/test_scene_copy_c.py M tests/python/render_layer/test_scene_copy_d.py M tests/python/render_layer/test_scene_copy_e.py M tests/python/render_layer/test_scene_write_read.py =================================================================== diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py index 70bd943557b..f6e16459ed3 100644 --- a/tests/python/render_layer/render_layer_common.py +++ b/tests/python/render_layer/render_layer_common.py @@ -783,3 +783,15 @@ class Clay: self._update() self._properties[name].use(data_path) setattr(self._properties[name], data_path, value) + + +def setup_extra_arguments(filepath): + """ + Create a value which is assigned to: ``UnitTesting._extra_arguments`` + """ + import sys + + extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else [] + sys.argv = [filepath] + extra_arguments[1:] + + return extra_arguments diff --git a/tests/python/render_layer/test_active_collection.py b/tests/python/render_layer/test_active_collection.py index 6e1438ab594..0094400f2a5 100644 --- a/tests/python/render_layer/test_active_collection.py +++ b/tests/python/render_layer/test_active_collection.py @@ -66,10 +66,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_collection_rename.py b/tests/python/render_layer/test_collection_rename.py index 596eea7135d..5cab6c10102 100644 --- a/tests/python/render_layer/test_collection_rename.py +++ b/tests/python/render_layer/test_collection_rename.py @@ -72,10 +72,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_a.py b/tests/python/render_layer/test_evaluation_render_settings_a.py index 62565adaff1..3a763dff5b1 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_a.py +++ b/tests/python/render_layer/test_evaluation_render_settings_a.py @@ -29,10 +29,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_b.py b/tests/python/render_layer/test_evaluation_render_settings_b.py index 64475dabfc3..01536e7edb1 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_b.py +++ b/tests/python/render_layer/test_evaluation_render_settings_b.py @@ -30,10 +30,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_c.py b/tests/python/render_layer/test_evaluation_render_settings_c.py index 325a4efdfc0..62450fac771 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_c.py +++ b/tests/python/render_layer/test_evaluation_render_settings_c.py @@ -29,10 +29,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_d.py b/tests/python/render_layer/test_evaluation_render_settings_d.py index faa3d437aca..cf29c4928a7 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_d.py +++ b/tests/python/render_layer/test_evaluation_render_settings_d.py @@ -29,10 +29,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_e.py b/tests/python/render_layer/test_evaluation_render_settings_e.py index 4e3fe221923..664fae7a208 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_e.py +++ b/tests/python/render_layer/test_evaluation_render_settings_e.py @@ -30,10 +30,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_f.py b/tests/python/render_layer/test_evaluation_render_settings_f.py index 1c69c1588af..47da4e65fcf 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_f.py +++ b/tests/python/render_layer/test_evaluation_render_settings_f.py @@ -31,10 +31,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_g.py b/tests/python/render_layer/test_evaluation_render_settings_g.py index 99c4c0e34e0..81f31fed410 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_g.py +++ b/tests/python/render_layer/test_evaluation_render_settings_g.py @@ -31,10 +31,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_h.py b/tests/python/render_layer/test_evaluation_render_settings_h.py index a21e14a4624..b6f61ddb031 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_h.py +++ b/tests/python/render_layer/test_evaluation_render_settings_h.py @@ -31,10 +31,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_render_settings_i.py b/tests/python/render_layer/test_evaluation_render_settings_i.py index 256ae76aa92..1ce307deb70 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_i.py +++ b/tests/python/render_layer/test_evaluation_render_settings_i.py @@ -31,10 +31,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py index 4c3ea5fce4b..6faebac79aa 100644 --- a/tests/python/render_layer/test_evaluation_selectability_a.py +++ b/tests/python/render_layer/test_evaluation_selectability_a.py @@ -49,10 +49,5 @@ class UnitTesting(RenderLayerTesting): # ############################################################ 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 e @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs