Update tests to reflect changes

Author: jenshnielsen

tests/drivers/test_lakeshore_335.py

@@ -4,7 +4,7 @@
 from qcodes.instrument import InstrumentBase
 from qcodes.instrument_drivers.Lakeshore import LakeshoreModel335
 
-from .test_lakeshore import (
+from .test_lakeshore_372 import (
     DictClass,
     MockVisaInstrument,
     command,

tests/drivers/test_lakeshore_336.py

@@ -4,7 +4,7 @@
 from qcodes.instrument import InstrumentBase
 from qcodes.instrument_drivers.Lakeshore import LakeshoreModel336
 
-from .test_lakeshore import (
+from .test_lakeshore_372 import (
     DictClass,
     MockVisaInstrument,
     command,

tests/drivers/test_lakeshore_336_legacy.py

@@ -2,9 +2,11 @@
 import time
 
 from qcodes.instrument import InstrumentBase
-from qcodes.instrument_drivers.Lakeshore.Model_336 import Model_336
+from qcodes.instrument_drivers.Lakeshore.Model_336 import (
+    Model_336,  # pyright: ignore[reportDeprecated]
+)
 
-from .test_lakeshore import (
+from .test_lakeshore_372 import (
     DictClass,
     MockVisaInstrument,
     command,
@@ -18,7 +20,7 @@
 VISA_LOGGER = ".".join((InstrumentBase.__module__, "com", "visa"))
 
 
-class Model_336_Mock(MockVisaInstrument, Model_336):
+class Model_336_Mock(MockVisaInstrument, Model_336):  # pyright: ignore[reportDeprecated]
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 

tests/drivers/test_lakeshore.py tests/drivers/test_lakeshore_372.pytests/drivers/test_lakeshore.py renamed to tests/drivers/test_lakeshore_372.py

@@ -11,10 +11,10 @@
 from typing_extensions import ParamSpec
 
 from qcodes.instrument import InstrumentBase
+from qcodes.instrument_drivers.Lakeshore import LakeshoreModel372
 from qcodes.instrument_drivers.Lakeshore.lakeshore_base import (
     LakeshoreBaseSensorChannel,
 )
-from qcodes.instrument_drivers.Lakeshore.Model_372 import Model_372
 from qcodes.logger import get_instrument_logger
 from qcodes.utils import QCoDeSDeprecationWarning
 
@@ -138,7 +138,7 @@ def __setattr__(self, name: str, value: Any) -> None:
         self._attrs[name] = value
 
 
-class Model_372_Mock(MockVisaInstrument, Model_372):
+class LakeshoreModel372Mock(MockVisaInstrument, LakeshoreModel372):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
@@ -365,7 +365,7 @@ def wrapped_fixture():
 
 @instrument_fixture(scope="function")
 def lakeshore_372():
-    return Model_372_Mock(
+    return LakeshoreModel372Mock(
         "lakeshore_372_fixture",
         "GPIB::3::INSTR",
         pyvisa_sim_file="lakeshore_model372.yaml",

tests/test_logger.py

@@ -17,7 +17,7 @@
 from qcodes.instrument_drivers.american_magnetics import AMIModel430, AMIModel4303D
 from qcodes.instrument_drivers.tektronix import TektronixAWG5208
 from qcodes.logger.log_analysis import capture_dataframe
-from tests.drivers.test_lakeshore import Model_372_Mock
+from tests.drivers.test_lakeshore_372 import LakeshoreModel372Mock
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator
@@ -58,8 +58,8 @@ def awg5208(caplog: LogCaptureFixture) -> "Generator[TektronixAWG5208, None, Non
 
 
 @pytest.fixture
-def model372() -> "Generator[Model_372_Mock, None, None]":
-    inst = Model_372_Mock(
+def model372() -> "Generator[LakeshoreModel372Mock, None, None]":
+    inst = LakeshoreModel372Mock(
         "lakeshore_372",
         "GPIB::3::INSTR",
         pyvisa_sim_file="lakeshore_model372.yaml",
@@ -231,7 +231,7 @@ def test_capture_dataframe() -> None:
     assert df.message[0] == TEST_LOG_MESSAGE
 
 
-def test_channels(model372: Model_372_Mock) -> None:
+def test_channels(model372: LakeshoreModel372Mock) -> None:
     """
     Test that messages logged in a channel are propagated to the
     main instrument.
@@ -265,7 +265,7 @@ def test_channels(model372: Model_372_Mock) -> None:
         assert f == u
 
 
-def test_channels_nomessages(model372: Model_372_Mock) -> None:
+def test_channels_nomessages(model372: LakeshoreModel372Mock) -> None:
     """
     Test that messages logged in a channel are not propagated to
     any instrument.