[Python-checkins] cpython (merge 3.4 -> default): Issue #21849: Ported from 2.7 tests for non-ASCII data.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/1784c1901af6
changeset:   94601:1784c1901af6
parent:      94596:b8acfbf5aa61
parent:      94600:908533d5a427
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Feb 13 15:19:08 2015 +0200
summary:
  Issue #21849: Ported from 2.7 tests for non-ASCII data.

files:
  Lib/test/_test_multiprocessing.py |  20 ++++++++++++------
  1 files changed, 13 insertions(+), 7 deletions(-)


diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -2020,6 +2020,12 @@
 class _TestRemoteManager(BaseTestCase):
 
     ALLOWED_TYPES = ('manager',)
+    values = ['hello world', None, True, 2.25,
+              'hall\xe5 v\xe4rlden',
+              '\u043f\u0440\u0438\u0432\u0456\u0442 \u0441\u0432\u0456\u0442',
+              b'hall\xe5 v\xe4rlden',
+             ]
+    result = values[:]
 
     @classmethod
     def _putter(cls, address, authkey):
@@ -2028,7 +2034,8 @@
             )
         manager.connect()
         queue = manager.get_queue()
-        queue.put(('hello world', None, True, 2.25))
+        # Note that xmlrpclib will deserialize object as a list not a tuple
+        queue.put(tuple(cls.values))
 
     def test_remote(self):
         authkey = os.urandom(32)
@@ -2048,8 +2055,7 @@
         manager2.connect()
         queue = manager2.get_queue()
 
-        # Note that xmlrpclib will deserialize object as a list not a tuple
-        self.assertEqual(queue.get(), ['hello world', None, True, 2.25])
+        self.assertEqual(queue.get(), self.result)
 
         # Because we are using xmlrpclib for serialization instead of
         # pickle this will cause a serialization error.
@@ -3405,12 +3411,12 @@
         name = os.path.join(os.path.dirname(__file__), 'mp_fork_bomb.py')
         if sm != 'fork':
             rc, out, err = test.script_helper.assert_python_failure(name, sm)
-            self.assertEqual('', out.decode('ascii'))
-            self.assertIn('RuntimeError', err.decode('ascii'))
+            self.assertEqual(out, b'')
+            self.assertIn(b'RuntimeError', err)
         else:
             rc, out, err = test.script_helper.assert_python_ok(name, sm)
-            self.assertEqual('123', out.decode('ascii').rstrip())
-            self.assertEqual('', err.decode('ascii'))
+            self.assertEqual(out.rstrip(), b'123')
+            self.assertEqual(err, b'')
 
 #
 # Issue #17555: ForkAwareThreadLock

-- 
Repository URL: https://hg.python.org/cpython