From 2991246089eadabb1f1ed6e921ed5114fb6e7203 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@basho.com>
Date: Tue, 31 May 2016 13:29:24 -0700
Subject: [PATCH] Ensure that BadResource only wraps other exceptions.

---
 riak/tests/test_pool.py           | 19 ++++++++++++++++++-
 riak/transports/tcp/connection.py |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/riak/tests/test_pool.py b/riak/tests/test_pool.py
index a5f8ffd5..eb6e0d54 100644
--- a/riak/tests/test_pool.py
+++ b/riak/tests/test_pool.py
@@ -3,11 +3,13 @@
 
 from six import PY2
 from threading import Thread, currentThread
-from riak.transports.pool import Pool, BadResource
 from random import SystemRandom
 from time import sleep
+
+from riak import RiakError
 from riak.tests import RUN_POOL
 from riak.tests.comparison import Comparison
+from riak.transports.pool import Pool, BadResource
 
 if PY2:
     from Queue import Queue
@@ -36,6 +38,21 @@ def create_resource(self):
 @unittest.skipUnless(RUN_POOL, 'RUN_POOL is 0')
 class PoolTest(unittest.TestCase, Comparison):
 
+    def test_can_raise_bad_resource(self):
+        ex_msg = 'exception-message!'
+        with self.assertRaises(BadResource) as cm:
+            raise BadResource(ex_msg)
+        ex = cm.exception
+        self.assertEqual(ex.args[0], ex_msg)
+
+    def test_bad_resource_inner_exception(self):
+        ex_msg = 'exception-message!'
+        ex = RiakError(ex_msg)
+        with self.assertRaises(BadResource) as cm:
+            raise BadResource(ex)
+        br_ex = cm.exception
+        self.assertEqual(br_ex.args[0], ex)
+
     def test_yields_new_object_when_empty(self):
         """
         The pool should create new resources as needed.
diff --git a/riak/transports/tcp/connection.py b/riak/transports/tcp/connection.py
index 90967043..b92f862f 100644
--- a/riak/transports/tcp/connection.py
+++ b/riak/transports/tcp/connection.py
@@ -186,7 +186,8 @@ def _recv(self, msglen):
             # https://docs.python.org/2/howto/sockets.html#using-a-socket
             # https://github.com/basho/riak-python-client/issues/399
             if nbytes == 0:
-                raise BadResource('recv_into returned zero bytes unexpectedly')
+                ex = RiakError('recv_into returned zero bytes unexpectedly')
+                raise BadResource(ex)
             view = view[nbytes:]  # slicing views is cheap
             toread -= nbytes
             nread += nbytes