[Bf-blender-cvs] [d1debd96024] soc-2020-testing-frameworks: Merge branch 'master' into soc-2020-testing-frameworks

[calra123]

Commit: d1debd96024f0609244eddb85bdc15500918e8b4
Author: calra123
Date:   Sat Aug 8 15:03:22 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rBd1debd96024f0609244eddb85bdc15500918e8b4

Merge branch 'master' into soc-2020-testing-frameworks

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



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

diff --cc tests/python/modules/mesh_test.py
index a214071d185,af0e78257d5..c32ed6cca19
--- a/tests/python/modules/mesh_test.py
+++ b/tests/python/modules/mesh_test.py
@@@ -82,11 -80,11 +82,11 @@@ class ParticleSystemSpec
  
      def __init__(self, modifier_name: str, modifier_type: str, modifier_parameters: dict, frame_end: int):
          """
 -        Constructs a physics spec.
 -        :param modifier_name: str - name of object modifier, e.g. "Cloth"
 -        :param modifier_type: str - type of object modifier, e.g. "CLOTH"
 -        :param modifier_parameters: dict - {name : val} dictionary giving modifier parameters, e.g. {"quality" : 4}
 -        :param frame_end:int - the last frame of the simulation at which it is baked
 +        Constructs a particle system spec.
 +        :param modifier_name: str - name of object modifier, e.g. "Particles"
-         :param modifier_type: str - type of object modifier, e.g. "PARTICLE_SYSTEM", can be removed
++        :param modifier_type: str - type of object modifier, e.g. "PARTICLE_SYSTEM"
 +        :param modifier_parameters: dict - {name : val} dictionary giving modifier parameters, e.g. {"seed" : 1}
 +        :param frame_end:int - the last frame of the simulation at which the modifier is applied
          """
          self.modifier_name = modifier_name
          self.modifier_type = modifier_type
@@@ -418,15 -292,14 +418,15 @@@ class MeshTest
                  # Clean up first
                  bpy.ops.object.delete()
                  raise AttributeError("Modifier '{}' has no parameter named '{}'".
 -                                     format(physics_spec.modifier_type, param_name))
 -
 -        scene.frame_set(physics_spec.frame_end + 1)
 +                                     format(particle_sys_spec.modifier_type, param_name))
  
-         bpy.context.scene.frame_set(20)
 -        self._bake_current_simulation(test_object, physics_spec.modifier_type, physics_spec.modifier_name, physics_spec.frame_end)
++        bpy.context.scene.frame_set(particle_sys_spec.frame_end)
 +        test_object.select_set(True)
 +        bpy.ops.object.duplicates_make_real()
 +        test_object.select_set(True)
 +        bpy.ops.object.join()
          if self.apply_modifier:
 -            bpy.ops.object.modifier_apply(modifier=physics_spec.modifier_name)
 -
 +            self._apply_modifier(test_object, particle_sys_spec.modifier_name)
  
      def _apply_operator(self, test_object, operator: OperatorSpec):
          """