Fixing tests WIP

Author: Grimpy101

docker-compose.yml

@@ -5,3 +5,5 @@ services:
     image: postgres:9.6
     ports:
       - 5432:5432
+    environment:
+      POSTGRES_HOST_AUTH_METHOD: trust

flask_phpbb3/__init__.py

@@ -1,6 +1,6 @@
-import pkg_resources
+import importlib.metadata
 
-__version__ = pkg_resources.get_distribution(__name__).version
+__version__ = importlib.metadata.distribution(__name__).version
 
 from .extension import PhpBB3
 

tests/integration/base.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import typing
 import unittest
 
@@ -9,7 +7,6 @@
 
 import psycopg2
 import psycopg2.extensions
-import psycopg2.extras
 
 
 DB_HOST = '127.0.0.1'

tests/integration/test_extension.py

@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-import mock
+from unittest import mock
 
 from . import base
 

tests/unit/backends/test_base.py

@@ -1,10 +1,8 @@
-from __future__ import absolute_import
-
 import unittest
 
 import flask_phpbb3.backends.base
 
-import mock
+from unittest import mock
 
 
 class TestSessionHasPrivilege(unittest.TestCase):

tests/unit/backends/test_psycopg2.py

@@ -1,20 +1,18 @@
-from __future__ import absolute_import
-
 import unittest
 
 import flask_phpbb3.backends.psycopg2
 
-import mock
+from unittest import mock
 
-import werkzeug.contrib.cache
+import cachelib
 
 
 @mock.patch('flask_phpbb3.backends.psycopg2.Psycopg2Backend._db')
 class TestExecuteOperation(unittest.TestCase):
     def setUp(self):
         # type: () -> None
         self.connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
             }
@@ -112,7 +110,7 @@ def test_unknown_query(self, mocked_db):
 class TestPreparedCustomFieldsStatements(unittest.TestCase):
     def test_empty(self, mocked_db):
         connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
                 'CUSTOM_USER_FIELDS': [],
@@ -135,7 +133,7 @@ def test_empty(self, mocked_db):
 
     def test_valid(self, mocked_db):
         connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
                 'CUSTOM_USER_FIELDS': ['some_field', 'another_field'],
@@ -163,7 +161,7 @@ def test_valid(self, mocked_db):
 class TestPreparedCustomStatements(unittest.TestCase):
     def test_empty(self, mocked_db):
         connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
                 'CUSTOM_STATEMENTS': {},
@@ -186,7 +184,7 @@ def test_empty(self, mocked_db):
 
     def test_addition(self, mocked_db):
         connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
                 'CUSTOM_STATEMENTS': {
@@ -216,7 +214,7 @@ def test_addition(self, mocked_db):
 
     def test_override(self, mocked_db):
         connection = flask_phpbb3.backends.psycopg2.Psycopg2Backend(
-            werkzeug.contrib.cache.SimpleCache(),
+            cachelib.SimpleCache(),
             {
                 'TABLE_PREFIX': '',
                 'CUSTOM_STATEMENTS': {

tests/unit/test_sessions.py

@@ -1,11 +1,9 @@
-from __future__ import absolute_import
-
 import hashlib
 import unittest
 
 import flask_phpbb3.sessions
 
-import mock
+from unittest import mock
 
 
 class TestSession(unittest.TestCase):