added decorator, removed unnecessary skips in tests (#4)

Author: upcFrost

fakeredis/_server.py

@@ -2339,7 +2339,7 @@ def _lua_redis_log(self, lua_runtime, expected_globals, lvl, *args):
         msg = ' '.join([x.decode('utf-8')
                         if isinstance(x, bytes) else str(x)
                         for x in args if not isinstance(x, bool)])
-        LOGGER.log(REDIS_LOG_LEVELS_TO_LOGGING.get(lvl, logging.WARNING), msg)
+        LOGGER.log(REDIS_LOG_LEVELS_TO_LOGGING[lvl], msg)
 
     @command((bytes, Int), (bytes,), flags='s')
     def eval(self, script, numkeys, *keys_and_args):

test_fakeredis.py

@@ -56,6 +56,16 @@ def skip_test(*args, **kwargs):
 redis3_only = pytest.mark.skipif(not REDIS3, reason="Test is only applicable to redis-py 3.x")
 
 
+def fake_only(reason):
+    def wrap(func):
+        def wrapper(self):
+            if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
+                pytest.skip("Works only on fakeredis: %s" % reason)
+            func(self)
+        return wrapper
+    return wrap
+
+
 def key_val_dict(size=100):
     return {b'key:' + bytes([i]): b'val:' + bytes([i])
             for i in range(size)}
@@ -4160,9 +4170,8 @@ def test_script(self):
         result = script(args=[42])
         self.assertEqual(result, b'42')
 
+    @fake_only("requires access to redis log file")
     def test_lua_log(self):
-        if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
-            pytest.skip("Works only on fakeredis, as testing real redis will require access to its logs")
         logger = fakeredis._server.LOGGER
         script = """
             redis.log(redis.LOG_DEBUG, "debug")
@@ -4179,16 +4188,13 @@ def test_lua_log(self):
                                          'WARNING:%s:warning' % logger.name])
 
     def test_lua_log_no_message(self):
-        if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
-            pytest.skip("Works only on fakeredis, as testing real redis will require access to its logs")
         script = "redis.log(redis.LOG_DEBUG)"
         script = self.redis.register_script(script)
         with self.assertRaises(redis.ResponseError):
             script()
 
+    @fake_only("requires access to redis log file")
     def test_lua_log_different_types(self):
-        if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
-            pytest.skip("Works only on fakeredis, as testing real redis will require access to its logs")
         logger = fakeredis._server.LOGGER
         script = "redis.log(redis.LOG_DEBUG, 'string', 1, true, 3.14, 'string')"
         script = self.redis.register_script(script)
@@ -4197,16 +4203,13 @@ def test_lua_log_different_types(self):
         self.assertEqual(cm.output, ['DEBUG:%s:string 1 3.14 string' % logger.name])
 
     def test_lua_log_wrong_level(self):
-        if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
-            pytest.skip("Works only on fakeredis, as testing real redis will require access to its logs")
         script = "redis.log(10, 'string')"
         script = self.redis.register_script(script)
         with self.assertRaises(redis.ResponseError):
             script()
 
+    @fake_only("requires access to redis log file")
     def test_lua_log_defined_vars(self):
-        if not isinstance(self.redis, (fakeredis.FakeRedis, fakeredis.FakeStrictRedis)):
-            pytest.skip("Works only on fakeredis, as testing real redis will require access to its logs")
         logger = fakeredis._server.LOGGER
         script = """
             local var='string'