handle that newer versions of qcodes does not register broken instrum…

…ents
QCoDeS · Feb 10, 2022 · 7af3a32 · 7af3a32
1 parent 422d631
commit 7af3a32
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py b/qcodes_contrib_drivers/tests/QDevil/test_sim_qdac2_init.py
@@ -13,8 +13,11 @@ def test_refuse_wrong_model():
     # -----------------------------------------------------------------------
     assert 'Unknown model' in repr(error)
     # Circumvent Instrument not handling exceptions in constructor.
-    Instrument._all_instruments.pop(wrong_instrument)
-
+    # In qcodes < 0.32
+    try:
+        Instrument._all_instruments.pop(wrong_instrument)
+    except KeyError:
+        pass
 
 def test_refuse_incompatible_firmware():
     # -----------------------------------------------------------------------
@@ -23,4 +26,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