Have error counting contained within ConnectionPool and don't leak out to Transport

Thanks @bleskes for the inspiration!

test_elasticsearch/test_connection_pool.py

@@ -9,7 +9,7 @@ class TestConnectionPool(TestCase):
 
         connections = set()
         for _ in range(100):
-            connections.add(pool.get_connection()[0])
+            connections.add(pool.get_connection())
         self.assertEquals(connections, set(range(100)))
 
     def test_disable_shuffling(self):
@@ -17,7 +17,7 @@ class TestConnectionPool(TestCase):
 
         connections = []
         for _ in range(100):
-            connections.append(pool.get_connection()[0])
+            connections.append(pool.get_connection())
         self.assertEquals(connections, list(range(100)))
 
     def test_selectors_have_access_to_connection_opts(self):
@@ -28,38 +28,39 @@ class TestConnectionPool(TestCase):
 
         connections = []
         for _ in range(100):
-            connections.append(pool.get_connection()[0])
+            connections.append(pool.get_connection())
         self.assertEquals(connections, [x*x for x in range(100)])
 
     def test_dead_nodes_are_removed_from_active_connections(self):
         pool = ConnectionPool([(x, {}) for x in range(100)])
 
         now = time.time()
-        pool.mark_dead(42, 1, now=now)
+        pool.mark_dead(42, now=now)
         self.assertEquals(99, len(pool.connections))
         self.assertEquals(1, pool.dead.qsize())
         self.assertEquals((now + 60, 42), pool.dead.get())
 
     def test_connection_is_skipped_when_dead(self):
         pool = ConnectionPool([(x, {}) for x in range(2)])
-        pool.mark_dead(0, 1)
+        pool.mark_dead(0)
 
-        self.assertEquals([(1, 0), (1, 0), (1, 0)], [pool.get_connection(), pool.get_connection(), pool.get_connection(), ])
+        self.assertEquals([1, 1, 1], [pool.get_connection(), pool.get_connection(), pool.get_connection(), ])
 
     def test_connection_is_forcibly_resurrected_when_no_live_ones_are_availible(self):
         pool = ConnectionPool([(x, {}) for x in range(2)])
-        pool.mark_dead(0, 2) # failed twice, longer timeout
-        pool.mark_dead(1, 1) # failed the first time, first to be resurrected
+        pool.dead_count[0] = 1
+        pool.mark_dead(0) # failed twice, longer timeout
+        pool.mark_dead(1) # failed the first time, first to be resurrected
 
         self.assertEquals([], pool.connections)
-        self.assertEquals((1, 1), pool.get_connection())
+        self.assertEquals(1, pool.get_connection())
         self.assertEquals([1,], pool.connections)
 
     def test_connection_is_resurrected_after_its_timeout(self):
         pool = ConnectionPool([(x, {}) for x in range(100)])
 
         now = time.time()
-        pool.mark_dead(42, 1, now=now-61)
+        pool.mark_dead(42, now=now-61)
         pool.get_connection()
         self.assertEquals(42, pool.connections[-1])
         self.assertEquals(100, len(pool.connections))
@@ -67,7 +68,8 @@ class TestConnectionPool(TestCase):
     def test_already_failed_connection_has_longer_timeout(self):
         pool = ConnectionPool([(x, {}) for x in range(100)])
         now = time.time()
-        pool.mark_dead(42, 3, now=now)
+        pool.dead_count[42] = 2
+        pool.mark_dead(42, now=now)
 
         self.assertEquals(3, pool.dead_count[42])
         self.assertEquals((now + 4*60, 42), pool.dead.get())
@@ -75,7 +77,8 @@ class TestConnectionPool(TestCase):
     def test_dead_count_is_wiped_clean_for_connection_if_marked_live(self):
         pool = ConnectionPool([(x, {}) for x in range(100)])
         now = time.time()
-        pool.mark_dead(42, 3, now=now)
+        pool.dead_count[42] = 2
+        pool.mark_dead(42, now=now)
 
         self.assertEquals(3, pool.dead_count[42])
         pool.mark_live(42)