From a3be8743348464364db9d513b22bcdd39a2c5fb5 Mon Sep 17 00:00:00 2001
From: Jack Hindmarch <1750152+jackh-ncl@users.noreply.github.com>
Date: Wed, 19 Oct 2022 11:07:07 +0100
Subject: [PATCH] gh-92886: Fix tests that fail when running with optimizations
 (`-O`) in `_test_multiprocessing.py` (GH-93233)

---
 Lib/test/_test_multiprocessing.py             | 51 ++++++++++---------
 ...2-05-25-22-34-10.gh-issue-92886.1Lkt8S.rst |  1 +
 2 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2022-05-25-22-34-10.gh-issue-92886.1Lkt8S.rst

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index f74d8d7fbd726c..a66f4f5b897cd3 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5698,45 +5698,48 @@ def test_joinable_queue(self):
 
     @classmethod
     def _test_list(cls, obj):
-        assert obj[0] == 5
-        assert obj.count(5) == 1
-        assert obj.index(5) == 0
+        case = unittest.TestCase()
+        case.assertEqual(obj[0], 5)
+        case.assertEqual(obj.count(5), 1)
+        case.assertEqual(obj.index(5), 0)
         obj.sort()
         obj.reverse()
         for x in obj:
             pass
-        assert len(obj) == 1
-        assert obj.pop(0) == 5
+        case.assertEqual(len(obj), 1)
+        case.assertEqual(obj.pop(0), 5)
 
     def test_list(self):
         o = self.manager.list()
         o.append(5)
         self.run_worker(self._test_list, o)
-        assert not o
+        self.assertIsNotNone(o)
         self.assertEqual(len(o), 0)
 
     @classmethod
     def _test_dict(cls, obj):
-        assert len(obj) == 1
-        assert obj['foo'] == 5
-        assert obj.get('foo') == 5
-        assert list(obj.items()) == [('foo', 5)]
-        assert list(obj.keys()) == ['foo']
-        assert list(obj.values()) == [5]
-        assert obj.copy() == {'foo': 5}
-        assert obj.popitem() == ('foo', 5)
+        case = unittest.TestCase()
+        case.assertEqual(len(obj), 1)
+        case.assertEqual(obj['foo'], 5)
+        case.assertEqual(obj.get('foo'), 5)
+        case.assertListEqual(list(obj.items()), [('foo', 5)])
+        case.assertListEqual(list(obj.keys()), ['foo'])
+        case.assertListEqual(list(obj.values()), [5])
+        case.assertDictEqual(obj.copy(), {'foo': 5})
+        case.assertTupleEqual(obj.popitem(), ('foo', 5))
 
     def test_dict(self):
         o = self.manager.dict()
         o['foo'] = 5
         self.run_worker(self._test_dict, o)
-        assert not o
+        self.assertIsNotNone(o)
         self.assertEqual(len(o), 0)
 
     @classmethod
     def _test_value(cls, obj):
-        assert obj.value == 1
-        assert obj.get() == 1
+        case = unittest.TestCase()
+        case.assertEqual(obj.value, 1)
+        case.assertEqual(obj.get(), 1)
         obj.set(2)
 
     def test_value(self):
@@ -5747,10 +5750,11 @@ def test_value(self):
 
     @classmethod
     def _test_array(cls, obj):
-        assert obj[0] == 0
-        assert obj[1] == 1
-        assert len(obj) == 2
-        assert list(obj) == [0, 1]
+        case = unittest.TestCase()
+        case.assertEqual(obj[0], 0)
+        case.assertEqual(obj[1], 1)
+        case.assertEqual(len(obj), 2)
+        case.assertListEqual(list(obj), [0, 1])
 
     def test_array(self):
         o = self.manager.Array('i', [0, 1])
@@ -5758,8 +5762,9 @@ def test_array(self):
 
     @classmethod
     def _test_namespace(cls, obj):
-        assert obj.x == 0
-        assert obj.y == 1
+        case = unittest.TestCase()
+        case.assertEqual(obj.x, 0)
+        case.assertEqual(obj.y, 1)
 
     def test_namespace(self):
         o = self.manager.Namespace()
diff --git a/Misc/NEWS.d/next/Tests/2022-05-25-22-34-10.gh-issue-92886.1Lkt8S.rst b/Misc/NEWS.d/next/Tests/2022-05-25-22-34-10.gh-issue-92886.1Lkt8S.rst
new file mode 100644
index 00000000000000..2b9c1b4d2dd440
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-05-25-22-34-10.gh-issue-92886.1Lkt8S.rst
@@ -0,0 +1 @@
+Fixing tests that fail when running with optimizations (``-O``) in ``_test_multiprocessing.py``