Эх сурвалжийг харах

JSON surrogates Python: adjust regex for OSX error message.

OS X's version of Python has a slightly different error
message for this error case.
Josh Haberman 9 жил өмнө
parent
commit
923d2c7ccf

+ 2 - 2
python/google/protobuf/internal/json_format_test.py

@@ -260,12 +260,12 @@ class JsonFormatTest(JsonFormatBase):
     # Error case: unpaired high surrogate.
     # Error case: unpaired high surrogate.
     self.CheckError(
     self.CheckError(
         '{"stringValue": "\\uD83D"}',
         '{"stringValue": "\\uD83D"}',
-        r'Invalid \\uXXXX escape|Unpaired surrogate')
+        r'Invalid \\uXXXX escape|Unpaired (high )?surrogate')
 
 
     # Unpaired low surrogate.
     # Unpaired low surrogate.
     self.CheckError(
     self.CheckError(
         '{"stringValue": "\\uDE01"}',
         '{"stringValue": "\\uDE01"}',
-        r'Invalid \\uXXXX escape|Unpaired surrogate')
+        r'Invalid \\uXXXX escape|Unpaired (high )?surrogate')
 
 
 
 
   def testTimestampMessage(self):
   def testTimestampMessage(self):