From 92bc00e134c2700fa2bcc6d059e3f6efd2e3a74c Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Fri, 9 Feb 2024 16:44:24 +0100 Subject: [PATCH] ensure correct initialization of db engine for testing --- storage/tests/common.py | 8 ++++++++ storage/tests/test_storage.py | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/storage/tests/common.py b/storage/tests/common.py index bc72701..2524b5f 100644 --- a/storage/tests/common.py +++ b/storage/tests/common.py @@ -4,9 +4,17 @@ """ import config +import cco.storage.common +from cco.storage.common import getEngine, sessionFactory + config.dbname = 'ccotest' config.dbuser = 'ccotest' config.dbpassword = 'cco' +engine = getEngine(config.dbengine, config.dbname, + config.dbuser, config.dbpassword, + host=config.dbhost, port=config.dbport) +cco.storage.common.engine = engine +cco.storage.common.Session = sessionFactory(engine) import unittest from zope import component, interface diff --git a/storage/tests/test_storage.py b/storage/tests/test_storage.py index e72caab..6d6a839 100644 --- a/storage/tests/test_storage.py +++ b/storage/tests/test_storage.py @@ -3,12 +3,12 @@ """Comprehensive functional testing for SQL-based storage implementation. """ +from loops.storage.tests import common + import transaction from zope import component from zope.traversing.api import getName -from loops.storage.tests import common - import config from loops.concept import Concept from loops.config.base import LoopsOptions @@ -58,7 +58,7 @@ class TestStorage(common.TestCase): uid = util.getUidForObject(self.g.johnC) result = list(self.g.favorites.query(userName=uid)) self.assertEqual(len(result), 2) - self.assertEqual(list(favs.list(self.g.johnC)), [u'21', u'23']) + self.assertEqual(list(sorted(favs.list(self.g.johnC))), [u'21', u'23']) def test_zzz_tearDown(self): transaction.commit()