imprv: Tests: Use in-memory settings database

3 files changed, 8 insertions, 7 deletions

diff --git a/test/common/__init__.py b/test/common/__init__.py
index 39a978f19..83ec1f55a 100644
--- a/test/common/__init__.py
+++ b/test/common/__init__.py
@@ -10,5 +10,10 @@ def require_versions():
                          'GObject': '2.0',
                          'Pango': '1.0'})
 
-
 require_versions()
+
+from gajim.common import app
+from gajim.common.settings import Settings
+
+app.settings = Settings(in_memory=True)
+app.settings.init()
diff --git a/test/common/test_get_uf_relative_time.py b/test/common/test_get_uf_relative_time.py
index b36378628..02f7488db 100644
--- a/test/common/test_get_uf_relative_time.py
+++ b/test/common/test_get_uf_relative_time.py
@@ -8,10 +8,8 @@ from gajim.common import app
 from gajim.common.helpers import get_uf_relative_time
 from gajim.common.i18n import _
 from gajim.common.i18n import ngettext
-from gajim.common.settings import Settings
 
 local_timezone = datetime.now(timezone.utc).astimezone().tzinfo
-app.settings = Settings(in_memory=True)
 
 
 class GetRelativeTimeTest(unittest.TestCase):
diff --git a/test/common/test_styling.py b/test/common/test_styling.py
index 6ecec02bf..b1c05d00d 100644
--- a/test/common/test_styling.py
+++ b/test/common/test_styling.py
@@ -1,5 +1,4 @@
 import unittest
-from unittest.mock import MagicMock
 
 from gajim.common import app  # Avoids circular imports from common.helpers
 from gajim.common import styling
@@ -14,9 +13,8 @@ from gajim.common.styling import StrikeSpan
 from gajim.common.styling import StrongSpan
 from gajim.common.util.text import escape_iri_query
 
-app.settings = MagicMock()
-# additional_uri_schemes
-app.settings.get = MagicMock(return_value='a a- a. scheme')
+app.settings.set('additional_uri_schemes', 'a a- a. scheme')
+
 
 STYLING = {
     'pre cannot have children':  {