python
diff --git a/‎Lib/test/test_logging.py
Lines changed: 12 additions & 20 deletions b/‎Lib/test/test_logging.py
Lines changed: 12 additions & 20 deletions
@@ -4432,35 +4432,29 @@ def test_dict_arg(self):
     def _extract_logrecord_process_name(key, logMultiprocessing, conn=None):
         prev_logMultiprocessing = logging.logMultiprocessing
         logging.logMultiprocessing = logMultiprocessing
-        old_mp = None
         try:
             import multiprocessing as mp
             name = mp.current_process().name
 
             r1 = logging.makeLogRecord({'msg': f'msg1_{key}'})
 
-            old_mp = sys.modules['multiprocessing']
-            del sys.modules['multiprocessing']
-            assert old_mp
-
-            r2 = logging.makeLogRecord({'msg': f'msg2_{key}'})
+            with support.swap_item(sys.modules, 'multiprocessing', None):
+                # We need to restore the previous `multiprocessing` module:
+                # https://bugs.python.org/issue45128
+                r2 = logging.makeLogRecord({'msg': f'msg2_{key}'})
 
             results = {'processName'  : name,
                        'r1.processName': r1.processName,
                        'r2.processName': r2.processName,
                       }
         finally:
             logging.logMultiprocessing = prev_logMultiprocessing
-            if old_mp is not None:
-                # We need to restore the previous `multiprocessing` module:
-                # https://bugs.python.org/issue45128
-                sys.modules['multiprocessing'] = old_mp
         if conn:
             conn.send(results)
         else:
             return results
 
-    def test_multiprocessing(self):
+    def test_multiprocessing(self, first_pass=True):
         multiprocessing_imported = 'multiprocessing' in sys.modules
         try:
             # logMultiprocessing is True by default
@@ -4496,17 +4490,15 @@ def test_multiprocessing(self):
             if multiprocessing_imported:
                 import multiprocessing
 
-    def test_multiprocessing_again(self):
-        # https://bugs.python.org/issue45128
-        import sys
-        import multiprocessing.queues
+        if first_pass:  # https://bugs.python.org/issue45128
+            import multiprocessing.queues
 
-        self.test_multiprocessing()
+            self.test_multiprocessing(first_pass=False)
 
-        import multiprocessing
-        import multiprocessing.connection
-        from multiprocessing.connection import wait
-        multiprocessing.connection   # It was AttributeError here
+            import multiprocessing
+            import multiprocessing.connection
+            from multiprocessing.connection import wait
+            multiprocessing.connection   # It was AttributeError here
 
     def test_optional(self):
         r = logging.makeLogRecord({})