Move pickle tests to test_dict

Author: vstinner

Lib/test/pickletester.py

@@ -2886,6 +2886,8 @@ def test_recursive_dict_and_inst(self):
         self._test_recursive_collection_and_inst(dict.fromkeys, oldminproto=0)
 
     def test_recursive_frozendict_and_inst(self):
+        if self.py_version < (3, 15):
+            self.skipTest('need frozendict')
         self._test_recursive_collection_and_inst(frozendict.fromkeys, minprotocol=2)
 
     def test_recursive_set_and_inst(self):
@@ -3100,15 +3102,6 @@ def test_float_format(self):
         # make sure that floats are formatted locale independent with proto 0
         self.assertEqual(self.dumps(1.2, 0)[0:3], b'F1.')
 
-    def test_frozendict(self):
-        for proto in range(2, pickle.HIGHEST_PROTOCOL + 1):
-            for fd in (
-                frozendict(),
-                frozendict(x=1, y=2),
-            ):
-                p = self.dumps(fd, proto)
-                self.assert_is_copy(fd, self.loads(p))
-
     def test_reduce(self):
         for proto in protocols:
             with self.subTest(proto=proto):

Lib/test/test_dict.py

@@ -1825,6 +1825,15 @@ def __new__(self):
         self.assertEqual(type(fd), DictSubclass)
         self.assertEqual(created, frozendict(x=1))
 
+    def test_pickle(self):
+        for proto in range(2, pickle.HIGHEST_PROTOCOL + 1):
+            for fd in (
+                frozendict(),
+                frozendict(x=1, y=2),
+            ):
+                p = pickle.dumps(fd, proto)
+                self.assert_is_copy(fd, pickle.loads(p))
+
 
 if __name__ == "__main__":
     unittest.main()