Commit: 739788e75dbc1cac1be51857f5dff0e56da92ad2
Author: calra123
Date: Thu Aug 20 23:03:16 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB739788e75dbc1cac1be51857f5dff0e56da92ad2
Post Review: removed extra str, extra lines, minor fixes
===================================================================
M tests/python/deform_modifiers.py
M tests/python/modifiers.py
M tests/python/physics_dynamic_paint.py
M tests/python/physics_ocean.py
M tests/python/physics_particle_system.py
M tests/python/physics_softbody.py
===================================================================
diff --git a/tests/python/deform_modifiers.py b/tests/python/deform_modifiers.py
index 3a7d7fab128..fdadbd86dc1 100644
--- a/tests/python/deform_modifiers.py
+++ b/tests/python/deform_modifiers.py
@@ -64,7 +64,7 @@ tests = [
[ModifierSpec('hook2', 'HOOK', {'object':
bpy.data.objects["Empty.001"],
'vertex_group': 'hook_vg'}),
ModifierSpec('laplace', 'LAPLACIANDEFORM',
{'vertex_group': 'laplace_vg'})],
- ObjectOperatorSpec('laplaciandeform_bind',
{'modifier':'laplace'}))]),
+ ObjectOperatorSpec('laplaciandeform_bind',
{'modifier': 'laplace'}))]),
MeshTest("WarpPlane", "testObjPlaneWarp", "expObjPlaneWarp",
@@ -77,27 +77,24 @@ tests = [
#############################################
MeshTest("CurveArmature", "testObjBezierCurveArmature",
"expObjBezierCurveArmature",
[DeformModifierSpec(10, [ModifierSpec('curve_armature',
'ARMATURE',
- {'object':
bpy.data.objects['testArmatureHelper'],'use_vertex_groups': False,
'use_bone_envelopes': True})])]),
+ {'object':
bpy.data.objects['testArmatureHelper'],
+ 'use_vertex_groups':
False, 'use_bone_envelopes': True})])]),
MeshTest("CurveLattice", "testObjBezierCurveLattice",
"expObjBezierCurveLattice",
[DeformModifierSpec(10, [ModifierSpec('curve_lattice', 'LATTICE',
{'object':
bpy.data.objects['testLatticeCurve']})])]),
-
# HOOK for Curves can't be tested with current framework, as it requires
going to Edit Mode to select vertices,
# here is no equivalent of a vertex group in Curves.
# Dummy test for Hook, can also be called corner case
MeshTest("CurveHook", "testObjBezierCurveHook", "expObjBezierCurveHook",
[DeformModifierSpec(10, [ModifierSpec('curve_Hook', 'HOOK',
{'object': bpy.data.objects['EmptyCurve']})])]),
-
-
MeshTest("MeshDeformCurve", "testObjCurveMeshDeform",
"expObjCurveMeshDeform",
[DeformModifierSpec(10, [ModifierSpec('mesh_deform_curve',
'MESH_DEFORM', {'object': bpy.data.objects["Cylinder"],
'precision': 2})],
ObjectOperatorSpec('meshdeform_bind',
{'modifier': 'mesh_deform_curve'}))]),
-
MeshTest("WarpCurve", "testObjBezierCurveWarp", "expObjBezierCurveWarp",
[DeformModifierSpec(10, [ModifierSpec('warp_curve', 'WARP',
{'object_from':
bpy.data.objects["From_curve"],
@@ -114,6 +111,6 @@ for i, cmd in enumerate(command):
break
elif cmd == "--run-test":
deform_tests.apply_modifiers = False
- name = str(command[i + 1])
+ name = command[i + 1]
deform_tests.run_test(name)
break
diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py
index e1524432ab7..d5b4879e420 100644
--- a/tests/python/modifiers.py
+++ b/tests/python/modifiers.py
@@ -62,8 +62,6 @@ def get_generate_modifiers_list(test_object_name,
randomize=False):
# ModifierSpec('remesh', 'REMESH', {}),
# ModifierSpec('screw', 'SCREW', {}), # screw can make the test very
slow. Skipping for now.
- # ModifierSpec('skin', 'SKIN', {}), # skin is not reproducible .
-
ModifierSpec('solidify', 'SOLIDIFY', {}),
ModifierSpec('subsurf', 'SUBSURF', {}),
@@ -348,7 +346,7 @@ def main():
break
elif cmd == "--run-test":
modifiers_test.apply_modifiers = False
- name = str(command[i + 1])
+ name = command[i + 1]
modifiers_test.run_test(name)
break
diff --git a/tests/python/physics_dynamic_paint.py
b/tests/python/physics_dynamic_paint.py
index f920f60cca0..b70f416f495 100644
--- a/tests/python/physics_dynamic_paint.py
+++ b/tests/python/physics_dynamic_paint.py
@@ -46,7 +46,7 @@ def main():
break
elif cmd == "--run-test":
dynamic_paint_test.apply_modifiers = False
- name = str(command[i + 1])
+ name = command[i + 1]
dynamic_paint_test.run_test(name)
break
diff --git a/tests/python/physics_ocean.py b/tests/python/physics_ocean.py
index 5988b8ea76a..b3d6f929d7e 100644
--- a/tests/python/physics_ocean.py
+++ b/tests/python/physics_ocean.py
@@ -43,8 +43,8 @@ def main():
break
elif cmd == "--run-test":
ocean_test.apply_modifiers = False
- index = int(command[i + 1])
- ocean_test.run_test(index)
+ name = command[i + 1]
+ ocean_test.run_test(name)
break
diff --git a/tests/python/physics_particle_system.py
b/tests/python/physics_particle_system.py
index 82d95ed548e..4b03bf06118 100644
--- a/tests/python/physics_particle_system.py
+++ b/tests/python/physics_particle_system.py
@@ -42,7 +42,7 @@ def main():
break
elif cmd == "--run-test":
particle_test.apply_modifiers = False
- name = str(command[i + 1])
+ name = command[i + 1]
particle_test.run_test(name)
break
diff --git a/tests/python/physics_softbody.py b/tests/python/physics_softbody.py
index eb1ddfde15c..15c85d6f119 100644
--- a/tests/python/physics_softbody.py
+++ b/tests/python/physics_softbody.py
@@ -43,7 +43,7 @@ def main():
break
elif cmd == "--run-test":
soft_body_test.apply_modifiers = False
- name = str(command[i + 1])
+ name = command[i + 1]
soft_body_test.run_test(name)
break
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
