Merge pull request #186 from netomi/further-unit-test-fixes

Further unit test fixes

test/integration/base_storage_test.py

@@ -83,16 +83,16 @@ async def test_keys_values(self):
             for k, v in test_data.items():
                 await cache.write(k, v)
 
-        assert sorted([k async for k in cache.keys()]) == sorted(test_data.keys())
-        assert sorted([v async for v in cache.values()]) == sorted(test_data.values())
+            assert sorted([k async for k in cache.keys()]) == sorted(test_data.keys())
+            assert sorted([v async for v in cache.values()]) == sorted(test_data.values())
 
     async def test_size(self):
         async with self.init_cache() as cache:
             assert await cache.size() == 0
             for k, v in self.test_data.items():
                 await cache.write(k, v)
 
-        assert await cache.size() == len(self.test_data)
+            assert await cache.size() == len(self.test_data)
 
     async def test_clear(self):
         async with self.init_cache() as cache:

test/integration/test_redis.py

@@ -36,7 +36,3 @@ class TestRedisCache(BaseStorageTest):
 
 class TestRedisBackend(BaseBackendTest):
     backend_class = RedisBackend
-
-    @pytest.mark.skip(reason='Test not yet working for Redis backend')
-    async def test_gather(self):
-        super().test_gather()

test/integration/test_sqlite.py

@@ -1,11 +1,10 @@
 import asyncio
 import os
 from tempfile import gettempdir
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 
-from aiohttp_client_cache.backends import CacheBackend
 from aiohttp_client_cache.backends.sqlite import SQLiteBackend, SQLiteCache, SQLitePickleCache
 from test.conftest import CACHE_NAME, httpbin, skip_37
 from test.integration import BaseBackendTest, BaseStorageTest
@@ -139,6 +138,7 @@ async def test_close(self):
 
 
 class TestSQLitePickleCache(BaseStorageTest):
+    init_kwargs = {'use_temp': True}
     picklable = True
     storage_class = SQLitePickleCache
 
@@ -148,10 +148,12 @@ class TestSQLiteBackend(BaseBackendTest):
     init_kwargs = {'use_temp': True}
 
     @skip_37
-    @patch.object(CacheBackend, 'close')
-    async def test_autoclose__default(self, mock_close):
+    async def test_autoclose__default(self):
         """By default, the backend should be closed when the session is closed"""
 
         async with self.init_session() as session:
+            mock_close = MagicMock(wraps=session.cache.close)
+            session.cache.close = mock_close
+
             await session.get(httpbin('get'))
         mock_close.assert_called_once()