pytest framework and server commands

Author: andy

redis/client.py

@@ -243,7 +243,7 @@ class StrictRedis(object):
             'PING': lambda r: nativestr(r) == 'PONG',
             'RANDOMKEY': lambda r: r and r or None,
             'SCRIPT': parse_script,
-            'SET': lambda r: r and nativestr(r) == 'OK' or None,
+            'SET': lambda r: r and nativestr(r) == 'OK',
             'TIME': lambda x: (int(x[0]), int(x[1]))
         }
     )
@@ -430,22 +430,10 @@ def dbsize(self):
         "Returns the number of keys in the current database"
         return self.execute_command('DBSIZE')
 
-    def time(self):
-        """
-        Returns the server time as a 2-item tuple of ints:
-        (seconds since epoch, microseconds into this second).
-        """
-        return self.execute_command('TIME')
-
     def debug_object(self, key):
         "Returns version specific metainformation about a give key"
         return self.execute_command('DEBUG', 'OBJECT', key)
 
-    def delete(self, *names):
-        "Delete one or more keys specified by ``names``"
-        return self.execute_command('DEL', *names)
-    __delitem__ = delete
-
     def echo(self, value):
         "Echo the string back from the server"
         return self.execute_command('ECHO', value)
@@ -514,6 +502,13 @@ def slaveof(self, host=None, port=None):
             return self.execute_command("SLAVEOF", "NO", "ONE")
         return self.execute_command("SLAVEOF", host, port)
 
+    def time(self):
+        """
+        Returns the server time as a 2-item tuple of ints:
+        (seconds since epoch, microseconds into this second).
+        """
+        return self.execute_command('TIME')
+
     #### BASIC KEY COMMANDS ####
     def append(self, key, value):
         """
@@ -523,13 +518,6 @@ def append(self, key, value):
         """
         return self.execute_command('APPEND', key, value)
 
-    def getrange(self, key, start, end):
-        """
-        Returns the substring of the string value stored at ``key``,
-        determined by the offsets ``start`` and ``end`` (both are inclusive)
-        """
-        return self.execute_command('GETRANGE', key, start, end)
-
     def bitcount(self, key, start=None, end=None):
         """
         Returns the count of set bits in the value of ``key``.  Optional
@@ -558,6 +546,11 @@ def decr(self, name, amount=1):
         """
         return self.execute_command('DECRBY', name, amount)
 
+    def delete(self, *names):
+        "Delete one or more keys specified by ``names``"
+        return self.execute_command('DEL', *names)
+    __delitem__ = delete
+
     def exists(self, name):
         "Returns a boolean indicating whether key ``name`` exists"
         return self.execute_command('EXISTS', name)
@@ -601,6 +594,13 @@ def getbit(self, name, offset):
         "Returns a boolean indicating the value of ``offset`` in ``name``"
         return self.execute_command('GETBIT', name, offset)
 
+    def getrange(self, key, start, end):
+        """
+        Returns the substring of the string value stored at ``key``,
+        determined by the offsets ``start`` and ``end`` (both are inclusive)
+        """
+        return self.execute_command('GETRANGE', key, start, end)
+
     def getset(self, name, value):
         """
         Set the value at key ``name`` to ``value`` if key doesn't exist
@@ -643,20 +643,33 @@ def mget(self, keys, *args):
         args = list_or_args(keys, args)
         return self.execute_command('MGET', *args)
 
-    def mset(self, mapping):
-        "Sets each key in the ``mapping`` dict to its corresponding value"
+    def mset(self, *args, **kwargs):
+        """
+        Sets key/values based on a mapping. Mapping can be supplied as a single
+        dictionary argument or as kwargs.
+        """
+        if args:
+            if len(args) != 1 or not isinstance(args[0], dict):
+                raise RedisError('MSET requires **kwargs or a single dict arg')
+            kwargs.update(args[0])
         items = []
-        for pair in iteritems(mapping):
+        for pair in iteritems(kwargs):
             items.extend(pair)
         return self.execute_command('MSET', *items)
 
-    def msetnx(self, mapping):
+    def msetnx(self, *args, **kwargs):
         """
-        Sets each key in the ``mapping`` dict to its corresponding value if
-        none of the keys are already set
+        Sets key/values based on a mapping if none of the keys are already set.
+        Mapping can be supplied as a single dictionary argument or as kwargs.
+        Returns a boolean indicating if the operation was successful.
         """
+        if args:
+            if len(args) != 1 or not isinstance(args[0], dict):
+                raise RedisError('MSETNX requires **kwargs or a single '
+                                 'dict arg')
+            kwargs.update(args[0])
         items = []
-        for pair in iteritems(mapping):
+        for pair in iteritems(kwargs):
             items.extend(pair)
         return self.execute_command('MSETNX', *items)
 

run_tests

@@ -1,12 +1,29 @@
 #!/usr/bin/env python
 import os
+import sys
 
 from redis import __version__
 
 try:
     from setuptools import setup
+    from setuptools.command.test import test as TestCommand
+
+    class PyTest(TestCommand):
+        def finalize_options(self):
+            TestCommand.finalize_options(self)
+            self.test_args = []
+            self.test_suite = True
+
+        def run_tests(self):
+            #import here, cause outside the eggs aren't loaded
+            import pytest
+            errno = pytest.main(self.test_args)
+            sys.exit(errno)
+
 except ImportError:
+
     from distutils.core import setup
+    PyTest = lambda x: x
 
 f = open(os.path.join(os.path.dirname(__file__), 'README.rst'))
 long_description = f.read()
@@ -25,7 +42,8 @@
     keywords=['Redis', 'key-value store'],
     license='MIT',
     packages=['redis'],
-    test_suite='tests.all_tests',
+    tests_require=['pytest'],
+    cmdclass={'test': PyTest},
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',

setup.py

@@ -1,31 +0,0 @@
-import unittest
-
-from tests.server_commands import ServerCommandsTestCase
-from tests.connection_pool import ConnectionPoolTestCase
-from tests.connection_pool import BlockingConnectionPoolTestCase
-from tests.pipeline import PipelineTestCase
-from tests.lock import LockTestCase
-from tests.pubsub import PubSubTestCase, PubSubRedisDownTestCase
-from tests.encoding import (PythonParserEncodingTestCase,
-                            HiredisEncodingTestCase)
-
-try:
-    import hiredis
-    use_hiredis = True
-except ImportError:
-    use_hiredis = False
-
-
-def all_tests():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ServerCommandsTestCase))
-    suite.addTest(unittest.makeSuite(ConnectionPoolTestCase))
-    suite.addTest(unittest.makeSuite(BlockingConnectionPoolTestCase))
-    suite.addTest(unittest.makeSuite(PipelineTestCase))
-    suite.addTest(unittest.makeSuite(LockTestCase))
-    suite.addTest(unittest.makeSuite(PubSubTestCase))
-    suite.addTest(unittest.makeSuite(PubSubRedisDownTestCase))
-    suite.addTest(unittest.makeSuite(PythonParserEncodingTestCase))
-    if use_hiredis:
-        suite.addTest(unittest.makeSuite(HiredisEncodingTestCase))
-    return suite