internal change for protobuf

PiperOrigin-RevId: 573075750
pybind · Oct 13, 2023 · c75f3e6 · c75f3e6
1 parent 0ffef4a
commit c75f3e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/pybind11_protobuf/tests/BUILD b/pybind11_protobuf/tests/BUILD
@@ -2,6 +2,8 @@
 
 load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_proto_library")
 
+load("//net/proto2/python/public:build_defs.bzl", "py_test_multiple_proto_implementations")
+
 # Placeholder: load py_proto_library
 # Placeholder: load py_library
 load("@pybind11_bazel//:build_defs.bzl", "pybind_extension")
@@ -108,7 +110,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "proto_enum_test",
     srcs = ["proto_enum_test.py"],
     data = [":proto_enum_module.so"],
@@ -117,7 +119,6 @@ py_test(
     deps = [
         ":test_py_pb2",
         "@com_google_absl_py//absl/testing:absltest",
-        "@com_google_protobuf//:protobuf_python",
     ],
 )
 
@@ -132,7 +133,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "dynamic_message_test",
     srcs = ["dynamic_message_test.py"],
     data = [":dynamic_message_module.so"],
@@ -161,7 +162,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "extension_test",
     srcs = ["extension_test.py"],
     data = [
@@ -178,7 +179,6 @@ py_test(
         ":test_py_pb2",  # fixdeps: keep - Direct dependency needed in open-source version, see https://github.com/grpc/grpc/issues/22811
         "@com_google_absl_py//absl/testing:absltest",
         "@com_google_absl_py//absl/testing:parameterized",
-        "@com_google_protobuf//:protobuf_python",
     ],
 )
 
@@ -192,7 +192,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "message_test",
     srcs = ["message_test.py"],
     data = [
@@ -221,7 +221,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "pass_by_test",
     srcs = ["pass_by_test.py"],
     data = [":pass_by_module.so"],
@@ -259,7 +259,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "wrapped_proto_module_test",
     srcs = ["wrapped_proto_module_test.py"],
     data = [":wrapped_proto_module.so"],
@@ -270,7 +270,6 @@ py_test(
         ":test_py_pb2",
         "@com_google_absl_py//absl/testing:absltest",
         "@com_google_absl_py//absl/testing:parameterized",
-        "@com_google_protobuf//:protobuf_python",
     ],
 )
 
@@ -285,7 +284,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "thread_module_test",
     srcs = ["thread_module_test.py"],
     data = [":thread_module.so"],
@@ -295,7 +294,6 @@ py_test(
         ":test_py_pb2",
         "@com_google_absl_py//absl/testing:absltest",
         "@com_google_absl_py//absl/testing:parameterized",
-        "@com_google_protobuf//:protobuf_python",
     ],
 )
 
@@ -308,7 +306,7 @@ pybind_extension(
     ],
 )
 
-py_test(
+py_test_multiple_proto_implementations(
     name = "regression_wrappers_test",
     srcs = ["regression_wrappers_test.py"],
     data = [":regression_wrappers_module.so"],

diff --git a/pybind11_protobuf/tests/message_test.py b/pybind11_protobuf/tests/message_test.py
@@ -436,11 +436,15 @@ def test_text_format_to_string(self):
 
   def test_text_format_parse(self):
     message = text_format.Parse(m.TEXT_FORMAT_MESSAGE, m.make_test_message())
-    self.assertMultiLineEqual(str(message), m.TEXT_FORMAT_MESSAGE)
+    self.assertMultiLineEqual(
+        text_format.MessageToString(message), m.TEXT_FORMAT_MESSAGE
+    )
 
   def test_text_format_merge(self):
     message = text_format.Merge(m.TEXT_FORMAT_MESSAGE, m.make_test_message())
-    self.assertMultiLineEqual(str(message), m.TEXT_FORMAT_MESSAGE)
+    self.assertMultiLineEqual(
+        text_format.MessageToString(message), m.TEXT_FORMAT_MESSAGE
+    )
 
   def test_proto_2_equal(self):
     self.assertProtoEqual(m.TEXT_FORMAT_MESSAGE,