diff -r 850a62354402 Lib/test/test_heapq.py
--- a/Lib/test/test_heapq.py	Mon Sep 22 00:44:17 2014 +0200
+++ b/Lib/test/test_heapq.py	Sun Sep 21 22:48:01 2014 -0400
@@ -253,6 +253,8 @@
 class GetOnly:
     "Dummy sequence class defining __getitem__ but not __len__."
     def __getitem__(self, ndx):
+        if ndx > 10:
+            raise IndexError
         return 10
 
 class CmpErr:
@@ -368,13 +370,13 @@
 
     def test_get_only(self):
         for f in (self.module.heapify, self.module.heappop):
-            self.assertRaises(TypeError, f, GetOnly())
+            self.assertRaises((TypeError, AttributeError), f, GetOnly())
         for f in (self.module.heappush, self.module.heapreplace):
-            self.assertRaises(TypeError, f, GetOnly(), 10)
+            self.assertRaises((TypeError, AttributeError), f, GetOnly(), 10)
         for f in (self.module.nlargest, self.module.nsmallest):
-            self.assertRaises(TypeError, f, 2, GetOnly())
+            self.assertEqual(f(2, GetOnly()), [10,10])
 
-    def test_get_only(self):
+    def test_cmp_only(self):
         seq = [CmpErr(), CmpErr(), CmpErr()]
         for f in (self.module.heapify, self.module.heappop):
             self.assertRaises(ZeroDivisionError, f, seq)