Fix status_testing_no_cpp_eh_test

PiperOrigin-RevId: 670957824
pybind · Sep 4, 2024 · 40c7e9d · 40c7e9d
1 parent baadf89
commit 40c7e9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pybind11_abseil/compat/status_from_py_exc.cc b/pybind11_abseil/compat/status_from_py_exc.cc
@@ -56,7 +56,7 @@ PyObject* PyStatusNotOkOrNone() {
   static PyObject* kImportedObj = nullptr;
   if (kImportedObj == nullptr) {
     kImportedObj = py_base_utilities::ImportObjectOrReturnNone(
-        "google3.third_party.pybind11_abseil.status", "StatusNotOk");
+        "pybind11_abseil.status", "StatusNotOk");
   }
   return kImportedObj;
 }

diff --git a/pybind11_abseil/tests/status_testing_no_cpp_eh_test_lib.py b/pybind11_abseil/tests/status_testing_no_cpp_eh_test_lib.py
@@ -53,10 +53,10 @@ def cb():
       expected = 'OK'
     else:
       expected = (
-          'INVALID_ARGUMENT: Unable to cast Python instance of type <class'
-          " 'list'> to C++ type 'absl::Status'"
+          r"INVALID_ARGUMENT: Unable to cast Python instance of type <class"
+          r" 'list'> to C\+\+ type 'absl::(\w*::)?Status'"
       )
-    self.assertEqual(self.tm.CallCallbackWithStatusReturn(cb), expected)
+    self.assertRegex(self.tm.CallCallbackWithStatusReturn(cb), expected)
 
   def testAssertionErrorBare(self):  # pylint: disable=invalid-name
 
@@ -117,10 +117,10 @@ def cb():
       expected = 'INVALID_ARGUMENT: TypeError: expecting int'
     else:
       expected = (
-          'INVALID_ARGUMENT: Unable to cast Python instance of type <class'
-          " 'str'> to C++ type 'absl::StatusOr<int>'"
+          r"INVALID_ARGUMENT: Unable to cast Python instance of type <class"
+          r" 'str'> to C\+\+ type 'absl::(\w*::)?StatusOr<int>'"
       )
-    self.assertEqual(self.tm.CallCallbackWithStatusOrIntReturn(cb), expected)
+    self.assertRegex(self.tm.CallCallbackWithStatusOrIntReturn(cb), expected)
 
 
 class StatusOrPyObjectPtrTest(absltest.TestCase):