summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2017-01-29 14:50:13 -0500
committerGitHub <noreply@github.com>2017-01-29 14:50:13 -0500
commit6e21b78f344ac5e6ca5e84331a552ded207a80e6 (patch)
tree2e8c25d92f627dfb925508f683561517605f21ac
parent497629abd32ec905818da8353028ab4827609c5e (diff)
parent610ea96a05e54b900609e03f796b4bfd43b20239 (diff)
downloadredis-py-6e21b78f344ac5e6ca5e84331a552ded207a80e6.tar.gz
Merge pull request #828 from jdufresne/warnings
Fix warning during test
-rw-r--r--tests/test_encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_encoding.py b/tests/test_encoding.py
index f0c67be..8b5bf5a 100644
--- a/tests/test_encoding.py
+++ b/tests/test_encoding.py
@@ -34,7 +34,7 @@ class TestEncoding(object):
class TestCommandsAndTokensArentEncoded(object):
@pytest.fixture()
def r(self, request):
- return _redis_client(request=request, charset='utf-16')
+ return _redis_client(request=request, encoding='utf-16')
def test_basic_command(self, r):
r.set('hello', 'world')