additional changes for sqlalchemy 2.0

device/tests/cli/manage/test_setup_commands.py

@@ -1,6 +1,7 @@
 """Test the setup_commands module."""
 import pytest
 from click.testing import CliRunner
+from sqlalchemy import select
 
 from fd_device.cli.manage.setup_commands import first_setup
 from fd_device.database.device import Device
@@ -18,13 +19,12 @@ def test_first_setup_execution():
 
 
 @pytest.mark.usefixtures("tables")
-def test_first_setup_already_completed(dbsession):
+def test_first_setup_already_completed():
     """Test that the cli command detects if setup already done."""
 
     # explicitly set the first_setup to true.
-    system = SystemSetup()
-    system.first_setup = True
-    system.save(dbsession)
+    system = SystemSetup.create()
+    system.update(first_setup=True)
 
     runner = CliRunner()
     result = runner.invoke(first_setup, input="N\n")
@@ -91,7 +91,7 @@ def test_first_setup_not_standalone_db(dbsession):
     input_text = "n\nY\n\n1\n\nY\n0.1\n"
     result = runner.invoke(first_setup, input=input_text)
 
-    device = dbsession.query(Device).one()
+    device = dbsession.execute(select(Device)).scalar_one()
 
     assert not result.exception
     assert isinstance(device.device_id, str)

device/tests/cli/manage/test_setup_commands_helper_functions.py

@@ -2,6 +2,7 @@
 import random
 
 import pytest
+from sqlalchemy import select
 
 from fd_device.cli.manage.setup_commands import initialize_device, initialize_grainbin
 from fd_device.database.device import Device
@@ -25,7 +26,7 @@ def test_initialize_device_no_hardware_or_software(dbsession):
 
     initialize_device()
 
-    device = dbsession.query(Device).first()
+    device = dbsession.execute(select(Device)).scalar_one_or_none()
 
     assert device is None
 
@@ -42,7 +43,7 @@ def test_initialize_device(dbsession):
 
     initialize_device()
 
-    device = dbsession.query(Device).first()
+    device = dbsession.execute(select(Device)).scalar_one()
 
     assert len(device.grainbins) == number_of_grainbins
 
@@ -61,12 +62,12 @@ def test_initialize_device_twice(dbsession):
     set_software_info("TEST_SOFTWARE_VERSION")
     initialize_device()
 
-    device = dbsession.query(Device).first()
+    device = dbsession.execute(select(Device)).scalar_one()
     assert len(device.grainbins) == number_of_grainbins
 
     # now initialize the device again.
     number_of_grainbins_second_time = random.randint(1, 10)
     set_hardware_info("TEST_HARDWARE_VERSION", str(number_of_grainbins_second_time))
     initialize_device()
-    device_second = dbsession.query(Device).first()
+    device_second = dbsession.execute(select(Device)).scalar_one()
     assert len(device_second.grainbins) == number_of_grainbins_second_time