[Bf-blender-cvs] [4a5165d9456] soc-2020-testing-frameworks: Changed from ModifierTest to RunTest

Himanshi Kalra noreply at git.blender.org
Thu Aug 27 16:04:14 CEST 2020


Commit: 4a5165d94560ef9111cf17119062a8d05bd528f8
Author: Himanshi Kalra
Date:   Thu Aug 27 18:46:49 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB4a5165d94560ef9111cf17119062a8d05bd528f8

Changed from ModifierTest to RunTest

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

M	tests/python/deform_modifiers.py
M	tests/python/modifiers.py
M	tests/python/physics_cloth.py
M	tests/python/physics_dynamic_paint.py
M	tests/python/physics_ocean.py
M	tests/python/physics_particle_instance.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 9a35ae0ad35..1642cdb6ac1 100644
--- a/tests/python/deform_modifiers.py
+++ b/tests/python/deform_modifiers.py
@@ -28,7 +28,7 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import MeshTest, ModifierSpec, OperatorSpecObjectMode, DeformModifierSpec, ModifierTest
+from modules.mesh_test import MeshTest, ModifierSpec, OperatorSpecObjectMode, DeformModifierSpec, RunTest
 
 tests = [
 
@@ -103,7 +103,7 @@ tests = [
 
 ]
 
-deform_tests = ModifierTest(tests)
+deform_tests = RunTest(tests)
 command = list(sys.argv)
 for i, cmd in enumerate(command):
     if cmd == "--run-all-tests":
diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py
index 4f775cb6c5d..c2bb5df65f9 100644
--- a/tests/python/modifiers.py
+++ b/tests/python/modifiers.py
@@ -26,7 +26,7 @@ from random import shuffle, seed
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ModifierSpec, MeshTest
+from modules.mesh_test import RunTest, ModifierSpec, MeshTest
 
 seed(0)
 
@@ -343,7 +343,7 @@ def main():
 
     ]
 
-    modifiers_test = ModifierTest(tests)
+    modifiers_test = RunTest(tests)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_cloth.py b/tests/python/physics_cloth.py
index 4c18dee6fc7..7c8b8fd1940 100644
--- a/tests/python/physics_cloth.py
+++ b/tests/python/physics_cloth.py
@@ -24,7 +24,7 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ModifierSpec, MeshTest
+from modules.mesh_test import RunTest, ModifierSpec, MeshTest
 
 
 def main():
@@ -47,7 +47,7 @@ def main():
                  [ModifierSpec('Cloth2', 'CLOTH', {'settings': {'use_internal_springs': True}}, 10)], threshold=1e-3),
 
     ]
-    cloth_test = ModifierTest(test)
+    cloth_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_dynamic_paint.py b/tests/python/physics_dynamic_paint.py
index c15999fb540..45ab5551978 100644
--- a/tests/python/physics_dynamic_paint.py
+++ b/tests/python/physics_dynamic_paint.py
@@ -24,7 +24,7 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ModifierSpec, MeshTest
+from modules.mesh_test import RunTest, ModifierSpec, MeshTest
 
 
 def main():
@@ -37,7 +37,7 @@ def main():
                                15)]),
 
     ]
-    dynamic_paint_test = ModifierTest(test)
+    dynamic_paint_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_ocean.py b/tests/python/physics_ocean.py
index a8bffc97a77..e569fea0074 100644
--- a/tests/python/physics_ocean.py
+++ b/tests/python/physics_ocean.py
@@ -24,7 +24,7 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ModifierSpec, MeshTest
+from modules.mesh_test import RunTest, ModifierSpec, MeshTest
 
 
 def main():
@@ -33,7 +33,7 @@ def main():
         MeshTest("PlaneOcean", "testObjPlaneOcean", "expObjPlaneOcean",
                  [ModifierSpec('Ocean', 'OCEAN', {})]),
     ]
-    ocean_test = ModifierTest(test)
+    ocean_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_particle_instance.py b/tests/python/physics_particle_instance.py
index 673dbe5995f..e7f882eaaa5 100644
--- a/tests/python/physics_particle_instance.py
+++ b/tests/python/physics_particle_instance.py
@@ -24,17 +24,18 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ModifierSpec, MeshTest
+from modules.mesh_test import RunTest, ModifierSpec, MeshTest
 
 
 def main():
     test = [
 
         MeshTest("ParticleInstanceSimple", "testParticleInstance", "expectedParticleInstance",
-                 [ModifierSpec('ParticleInstance', 'PARTICLE_INSTANCE', {'object': bpy.data.objects['Cube']})]),
+                 [ModifierSpec('ParticleInstance', 'PARTICLE_INSTANCE', {'object': bpy.data.objects['Cube']})],
+                 threshold=1e-3),
 
     ]
-    particle_instance_test = ModifierTest(test, threshold=1e-3)
+    particle_instance_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_particle_system.py b/tests/python/physics_particle_system.py
index e039e572a7e..0fc3e1ab622 100644
--- a/tests/python/physics_particle_system.py
+++ b/tests/python/physics_particle_system.py
@@ -24,17 +24,17 @@ import sys
 import bpy
 
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import ModifierTest, ParticleSystemSpec, MeshTest
+from modules.mesh_test import RunTest, ParticleSystemSpec, MeshTest
 
 
 def main():
     test = [
-        MeshTest("ParticleSystemTest", "test", "exp",
+        MeshTest("ParticleSystemTest", "testParticleSystem", "expParticleSystem",
          [ParticleSystemSpec('Particles', 'PARTICLE_SYSTEM', {'render_type': "OBJECT",
-          'instance_object': bpy.data.objects['Cube']}, 20)]),
+          'instance_object': bpy.data.objects['Cube']}, 20)], threshold=1e-3),
 
     ]
-    particle_test = ModifierTest(test, threshold=1e-3)
+    particle_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):
diff --git a/tests/python/physics_softbody.py b/tests/python/physics_softbody.py
index 22641062982..83ad26b05c6 100644
--- a/tests/python/physics_softbody.py
+++ b/tests/python/physics_softbody.py
@@ -35,7 +35,7 @@ def main():
                                {'settings': {'use_goal': False, 'bend': 8, 'pull': 0.8, 'push': 0.8}},
                                45)]),
     ]
-    soft_body_test = ModifierTest(test)
+    soft_body_test = RunTest(test)
 
     command = list(sys.argv)
     for i, cmd in enumerate(command):



More information about the Bf-blender-cvs mailing list