From bd21dd8548fc1ce1c44a414cc08b305945ed9dc7 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Thu, 10 Feb 2022 07:29:20 +0100 Subject: [PATCH] handle that newer versions of qcodes does not register broken instruments --- qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py index e2a3817c9..26586dbcf 100644 --- a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py +++ b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py @@ -23,4 +23,8 @@ def test_refuse_incompatible_firmware(): # ----------------------------------------------------------------------- assert 'Incompatible firmware' in repr(error) # Circumvent Instrument not handling exceptions in constructor. - Instrument._all_instruments.pop('qdac') + # In qcodes < 0.32 + try: + Instrument._all_instruments.pop('qdac') + except KeyError: + pass