pylint, pyformat and originally pushed wrong test cases (fixed)

Author: praneetnadella

sdks/python/apache_beam/internal/cloudpickle_pickler.py

@@ -40,11 +40,11 @@
 from apache_beam.internal.code_object_pickler import get_normalized_path
 
 DEFAULT_CONFIG = cloudpickle.CloudPickleConfig(
-    skip_reset_dynamic_type_state=True, filepath_interceptor=get_normalized_path)
-NO_DYNAMIC_CLASS_TRACKING_CONFIG = cloudpickle.CloudPickleConfig(
-    id_generator=None, skip_reset_dynamic_type_state=True, filepath_interceptor=get_normalized_path)
+    skip_reset_dynamic_type_state=True,
+    filepath_interceptor=get_normalized_path)
 STABLE_CODE_IDENTIFIER_CONFIG = cloudpickle.CloudPickleConfig(
-    skip_reset_dynamic_type_state=True, filepath_interceptor=get_normalized_path,
+    skip_reset_dynamic_type_state=True,
+    filepath_interceptor=get_normalized_path,
     get_code_object_params=cloudpickle.GetCodeObjectParams(
         get_code_object_identifier=code_object_pickler.
         get_code_object_identifier,

sdks/python/apache_beam/internal/cloudpickle_pickler_test.py

@@ -31,6 +31,7 @@
 from apache_beam.internal.cloudpickle_pickler import dumps
 from apache_beam.internal.cloudpickle_pickler import loads
 from apache_beam.utils import shared
+from unittest import mock
 
 GLOBAL_DICT_REF = module_test.GLOBAL_DICT
 
@@ -223,12 +224,14 @@ def test_best_effort_determinism_not_implemented(self):
           'Ignoring unsupported option: enable_best_effort_determinism',
           '\n'.join(l.output))
 
-  @unittest.mock.patch.object(
-      code_object_pickler,
-      'get_normalized_path',
-      wraps=code_object_pickler.get_normalized_path)
-  def test_default_config_interceptor(self, mock_get_normalized_path):
+  @mock.patch.object(
+      beam_cloudpickle.DEFAULT_CONFIG, 'filepath_interceptor', autospec=True
+  )
+  def test_default_config_interceptor(self, mock_filepath_interceptor):
     """Tests config.filepath_interceptor is called for CodeType pickling."""
+    mock_filepath_interceptor.side_effect = (
+      code_object_pickler.get_normalized_path
+    )
 
     def sample_func():
       return "Beam"
@@ -240,16 +243,18 @@ def sample_func():
       pickled_code = beam_cloudpickle.dumps(code_obj)
       unpickled_code = beam_cloudpickle.loads(pickled_code)
 
-      mock_get_normalized_path.assert_called()
+      mock_filepath_interceptor.assert_called()
 
       unpickled_filename = os.path.abspath(unpickled_code.co_filename)
       self.assertEqual(unpickled_filename, original_filename)
 
     except AttributeError as e:
       if 'get_code_object_params' in str(e):
         self.fail(
-            "Vendored cloudpickle BUG: AttributeError 'get_code_object_params' "
-            f"raised during CodeType pickling. Error: {e}")
+              "Vendored cloudpickle BUG: AttributeError "
+              f"'get_code_object_params' raised during CodeType pickling. "
+              f"Error: {e}"
+        )
       else:
         raise