Skip to content

Commit

Permalink
Test AMI430_3D init with a name of existing non AMI430 instrument
Browse files Browse the repository at this point in the history
  • Loading branch information
astafan8 committed Apr 22, 2021
1 parent c35d014 commit adcece8
Showing 1 changed file with 27 additions and 2 deletions.
29 changes: 27 additions & 2 deletions qcodes/tests/drivers/test_ami430.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
from hypothesis.strategies import floats, tuples

import qcodes.instrument.sims as sims
from qcodes.instrument.base import Instrument
from qcodes.instrument.ip_to_visa import AMI430_VISA
from qcodes.instrument_drivers.american_magnetics.AMI430 import (AMI430_3D,
from qcodes.instrument_drivers.american_magnetics.AMI430 import (AMI430,
AMI430_3D,
AMI430Warning)
from qcodes.math_utils.field_vector import FieldVector
from qcodes.utils.types import (numpy_concrete_floats, numpy_concrete_ints,
Expand Down Expand Up @@ -124,7 +126,7 @@ def test_instantiation_from_names(magnet_axes_instances, request):
assert driver._instrument_z is mag_z


def test_instantiation_from_name_of_nonexistent_instrument(
def test_instantiation_from_name_of_nonexistent_ami_instrument(
magnet_axes_instances, request
):
mag_x, mag_y, mag_z = magnet_axes_instances
Expand All @@ -143,6 +145,29 @@ def test_instantiation_from_name_of_nonexistent_instrument(
)


def test_instantiation_from_name_of_existing_non_ami_instrument(
magnet_axes_instances, request
):
mag_x, mag_y, mag_z = magnet_axes_instances
request.addfinalizer(AMI430_3D.close_all)

non_ami_existing_instrument = Instrument("foo")

with pytest.raises(
TypeError,
match=re.escape(
f"Instrument {non_ami_existing_instrument.name} is "
f"{type(non_ami_existing_instrument)} but {AMI430} "
f"was requested"
)
):
AMI430_3D(
"AMI430-3D",
mag_x.name, non_ami_existing_instrument.name, mag_z.name,
field_limit
)


def test_instantiation_from_badly_typed_argument(
magnet_axes_instances, request
):
Expand Down

0 comments on commit adcece8

Please sign in to comment.