Skip to content

READY: Ensure that BadResource only wraps other exceptions. #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2016
Merged

READY: Ensure that BadResource only wraps other exceptions. #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion riak/tests/test_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion riak/transports/tcp/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down