[Bf-blender-cvs] [77cde6f1a10] soc-2020-testing-frameworks: Resolved merge conflict, reformatted, break long lines, parameters

[Himanshi Kalra]

Commit: 77cde6f1a104f19c1ad49d78314e56f086a302a6
Author: Himanshi Kalra
Date:   Tue Dec 1 01:19:01 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB77cde6f1a104f19c1ad49d78314e56f086a302a6

Resolved merge conflict, reformatted, break long lines, parameters

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



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

diff --cc tests/python/modules/mesh_test.py
index bd916df7251,c85e7acf4e8..997a959ac17
--- a/tests/python/modules/mesh_test.py
+++ b/tests/python/modules/mesh_test.py
@@@ -168,8 -128,14 +168,16 @@@ class MeshTest
      the public method run_test().
      """
  
-     def __init__(self, test_name: str, test_object_name: str, expected_object_name: str, operations_stack=None,
-                  apply_modifiers=False, do_compare=False, threshold=None):
+     def __init__(
+             self,
++            test_name: str,
+             test_object_name: str,
+             expected_object_name: str,
+             operations_stack=None,
+             apply_modifiers=False,
 -            threshold=None,
++            do_compare=False,
++            threshold=None
+     ):
          """
          Constructs a MeshTest object. Raises a KeyError if objects with names expected_object_name
          or test_object_name don't exist.