Forward port r70470 and r70473 for OrderedDict to use a doubly linked list.
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 1800bec..3d00973 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -770,12 +770,19 @@
 class GeneralMappingTests(mapping_tests.BasicTestMappingProtocol):
     type2test = OrderedDict
 
+    def test_popitem(self):
+        d = self._empty_mapping()
+        self.assertRaises(KeyError, d.popitem)
+
 class MyOrderedDict(OrderedDict):
     pass
 
 class SubclassMappingTests(mapping_tests.BasicTestMappingProtocol):
     type2test = MyOrderedDict
 
+    def test_popitem(self):
+        d = self._empty_mapping()
+        self.assertRaises(KeyError, d.popitem)
 
 
 import doctest, collections