cut number 32 bit number parsing in Python 2 self-tests

Forwarded: no
Last-Update: 2019-09-12

Any number get back as zero. :-/

Gbp-Pq: Name 32bit.patch

diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py
index aa6f97b1b62b697abd3fcdb1a4b27a54c2a6178d..3582adf9c927a0d4d635a36bd1a4d5fbb441c9c4 100755 (executable)
--- a/python/google/protobuf/internal/text_format_test.py
+++ b/python/google/protobuf/internal/text_format_test.py
@@ -41,6 +41,8 @@ import textwrap
 
 import six
 
+import platform
+
 # pylint: disable=g-import-not-at-top
 try:
   import unittest2 as unittest  # PY26
@@ -909,29 +911,52 @@ class OnlyWorksWithProto2RightNowTests(TextFormatBase):
     all_data = message.SerializeToString()
     empty_message = unittest_pb2.TestEmptyMessage()
     empty_message.ParseFromString(all_data)
-    self.assertEqual('  1: 101\n'
-                     '  12: 4636878028842991616\n'
-                     '  14: "hello"\n'
-                     '  15: "103"\n'
-                     '  16 {\n'
-                     '    17: 104\n'
-                     '  }\n'
-                     '  18 {\n'
-                     '    1: 105\n'
-                     '  }\n',
-                     text_format.MessageToString(empty_message,
-                                                 indent=2,
-                                                 print_unknown_fields=True))
-    self.assertEqual('1: 101 '
-                     '12: 4636878028842991616 '
-                     '14: "hello" '
-                     '15: "103" '
-                     '16 { 17: 104 } '
-                     '18 { 1: 105 }',
-                     text_format.MessageToString(empty_message,
-                                                 print_unknown_fields=True,
-                                                 as_one_line=True))
-
+    if platform.architecture()[0] != '32bit':
+      self.assertEqual('  1: 101\n'
+                       '  12: 4636878028842991616\n'
+                       '  14: "hello"\n'
+                       '  15: "103"\n'
+                       '  16 {\n'
+                       '    17: 104\n'
+                       '  }\n'
+                       '  18 {\n'
+                       '    1: 105\n'
+                       '  }\n',
+                       text_format.MessageToString(empty_message,
+                                                   indent=2,
+                                                   print_unknown_fields=True))
+      self.assertEqual('1: 101 '
+                       '12: 4636878028842991616 '
+                       '14: "hello" '
+                       '15: "103" '
+                       '16 { 17: 104 } '
+                       '18 { 1: 105 }',
+                       text_format.MessageToString(empty_message,
+                                                   print_unknown_fields=True,
+                                                   as_one_line=True))
+    else:
+      self.assertEqual('  1: 101\n'
+                       '  12: 0\n'
+                       '  14: "hello"\n'
+                       '  15: "103"\n'
+                       '  16 {\n'
+                       '    17: 104\n'
+                       '  }\n'
+                       '  18 {\n'
+                       '    1: 105\n'
+                       '  }\n',
+                       text_format.MessageToString(empty_message,
+                                                   indent=2,
+                                                   print_unknown_fields=True))
+      self.assertEqual('1: 101 '
+                       '12: 0 '
+                       '14: "hello" '
+                       '15: "103" '
+                       '16 { 17: 104 } '
+                       '18 { 1: 105 }',
+                       text_format.MessageToString(empty_message,
+                                                   print_unknown_fields=True,
+                                                   as_one_line=True))
   def testPrintInIndexOrder(self):
     message = unittest_pb2.TestFieldOrderings()
     # Fields are listed in index order instead of field number.