Readd SQL tests.

Author: janiversen

pymodbus/datastore/database/sql_datastore.py

@@ -2,6 +2,7 @@
 # pylint: disable=missing-type-doc
 try:
     import sqlalchemy
+    from sqlalchemy.pool import StaticPool
     import sqlalchemy.types as sqltypes
     from sqlalchemy.schema import UniqueConstraint
     from sqlalchemy.sql import and_
@@ -29,7 +30,7 @@ def __init__(self, *args, **kwargs):  # pylint: disable=unused-argument
         self._table = None
         self._connection = None
         self.table = kwargs.get("table", "pymodbus")
-        self.database = kwargs.get("database", "sqlite:///pymodbus.db")
+        self.database = kwargs.get("database", "sqlite:///:memory:")
         self._db_create(self.table, self.database)
 
     def __str__(self):
@@ -92,8 +93,8 @@ def _db_create(self, table, database):
         :param table: The table name to create
         :param database: The database uri to use
         """
-        self._engine = sqlalchemy.create_engine(database, echo=False)
-        self._metadata = sqlalchemy.MetaData(self._engine)
+        args = dict(echo=False, connect_args={"check_same_thread": False}, poolclass=StaticPool)
+        self._engine = sqlalchemy.create_engine(database, **args)
         self._table = sqlalchemy.Table(
             table,
             self._metadata,
@@ -102,7 +103,7 @@ def _db_create(self, table, database):
             sqlalchemy.Column("value", sqltypes.Integer),
             UniqueConstraint("type", "index", name="key"),
         )
-        self._table.create(checkfirst=True)
+        self._table.create(self._engine)
         self._connection = self._engine.connect()
 
     def _get(self, type, offset, count):  # pylint: disable=redefined-builtin

pymodbus/payload.py

@@ -356,7 +356,7 @@ def _unpack_words(self, fstring, handle):
 
         # Repack as unsigned Integer
         handle = [pack(self._byteorder + "H", p) for p in handle]
-        Log.debug(handle)
+        Log.debug("handle: {}", handle)
         handle = b"".join(handle)
         return handle
 

test/test_datastore.py

@@ -337,7 +337,6 @@ def setUp(self):
     def tearDown(self):
         """Clean up the test environment"""
 
-    @pytest.mark.skip
     @pytest.mark.xdist_group(name="sql")
     def test_str(self):
         """Test string."""