diff options
author | Andy McCurdy <andy@andymccurdy.com> | 2014-01-28 12:01:06 -0800 |
---|---|---|
committer | Andy McCurdy <andy@andymccurdy.com> | 2014-01-28 12:01:06 -0800 |
commit | 163e9b7fb9d0b99ff63b02a7f36433fac82d9e5e (patch) | |
tree | aef6b70596859bbf45110ab602a67ac6825daf26 /tests/test_encoding.py | |
parent | 91a0b8b13b46bd8ea99b61823860ce9c8c3b67f6 (diff) | |
download | redis-py-163e9b7fb9d0b99ff63b02a7f36433fac82d9e5e.tar.gz |
with tox/travis, tests don't need to know about the environment
Diffstat (limited to 'tests/test_encoding.py')
-rw-r--r-- | tests/test_encoding.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 9764f16..2aa95d3 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -2,16 +2,14 @@ from __future__ import with_statement import pytest from redis._compat import unichr, u, unicode -from redis.utils import HIREDIS_AVAILABLE from .conftest import r as _redis_client -@pytest.fixture() -def r(request): - return _redis_client(request=request, decode_responses=True) +class TestEncoding(object): + @pytest.fixture() + def r(self, request): + return _redis_client(request=request, decode_responses=True) - -class BaseEncodingTests(object): def test_simple_encoding(self, r): unicode_string = unichr(3456) + u('abcd') + unichr(3421) r['unicode-string'] = unicode_string @@ -24,11 +22,3 @@ class BaseEncodingTests(object): result = [unicode_string, unicode_string, unicode_string] r.rpush('a', *result) assert r.lrange('a', 0, -1) == result - - -class TestPythonParserEncoding(BaseEncodingTests): - pass - -if HIREDIS_AVAILABLE: - class TestHiredisParserEncoding(BaseEncodingTests): - pass |