From 591d60d82286ca49ca4c1a89bd60f51550818e89 Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Thu, 16 Apr 2020 19:59:57 +0200 Subject: [PATCH] Remove tests of deprecated contrib drivers --- qcodes/tests/drivers/test_m2j.py | 58 ------- qcodes/tests/drivers/test_zihdawg8.py | 219 -------------------------- 2 files changed, 277 deletions(-) delete mode 100644 qcodes/tests/drivers/test_m2j.py delete mode 100644 qcodes/tests/drivers/test_zihdawg8.py diff --git a/qcodes/tests/drivers/test_m2j.py b/qcodes/tests/drivers/test_m2j.py deleted file mode 100644 index 8a57f696773..00000000000 --- a/qcodes/tests/drivers/test_m2j.py +++ /dev/null @@ -1,58 +0,0 @@ -import sys -import unittest -from unittest.mock import MagicMock, call - -sys.modules['spirack'] = MagicMock(name='spirack') -from spirack import M2j_module, SPI_rack -from qcodes.instrument_drivers.QuTech.M2j import M2j - - -class TestM2j(unittest.TestCase): - - def test_gain(self): - spi_rack = MagicMock() - m2j = M2j('test', spi_rack, 42) - gain_too_low = 32 - gain_too_high = 111 - with self.assertRaises(ValueError): - m2j.gain.set(gain_too_low) - with self.assertRaises(ValueError): - m2j.gain.set(gain_too_high) - - for gain in range(33, 56): - m2j.gain.set(gain) - - ref_scales = [4095, 3740, 3325, 3030, 2801, 2615, 2457, 2320, 2199, - 2091, 1994, 1904, 1822, 1747, 1676, 1610, 1548, 1489, - 1434, 1381, 1331, 1284, 1238] - calls = [call.set_gain(ref_scale) for ref_scale in ref_scales] - m2j.m2j.assert_has_calls(calls) - m2j.close() - - def test_gain_floats(self): - spi_rack = MagicMock() - m2j = M2j('test_float', spi_rack, 42) - gain_too_low = 32.5 - gain_too_high = 111.1 - with self.assertRaises(ValueError): - m2j.gain.set(gain_too_low) - with self.assertRaises(ValueError): - m2j.gain.set(gain_too_high) - - for gain in [g + 0.1 for g in range(33, 55)]: - m2j.gain.set(gain) - - ref_scales = [4095, 3690, 3291, 3005, 2781, 2598, 2442, 2307, 2188, - 2081, 1984, 1896, 1815, 1739, 1669, 1603, 1542, 1483, - 1428, 1376, 1326, 1279] - calls = [call.set_gain(ref_scale) for ref_scale in ref_scales] - m2j.m2j.assert_has_calls(calls) - m2j.close() - - def test_rf_level(self): - spi_rack = MagicMock() - m2j = M2j('test_rf', spi_rack, 42) - - m2j.RF_level.get() - m2j.m2j.assert_has_calls([call.get_level()]) - m2j.close() diff --git a/qcodes/tests/drivers/test_zihdawg8.py b/qcodes/tests/drivers/test_zihdawg8.py deleted file mode 100644 index 222585b720a..00000000000 --- a/qcodes/tests/drivers/test_zihdawg8.py +++ /dev/null @@ -1,219 +0,0 @@ -import sys -import textwrap -import unittest -from unittest.mock import patch, MagicMock - -sys.modules['zhinst.utils'] = MagicMock(name='zhinst.utils') -sys.modules['zhinst'] = MagicMock(name='zhinst') -import zhinst.utils - -from qcodes.instrument_drivers.ZI.ZIHDAWG8 import ZIHDAWG8 -from qcodes.utils import validators - - -class TestZIHDAWG8(unittest.TestCase): - def setUp(self): - self.node_tree = {"/DEV8049/SYSTEM/AWG/CHANNELGROUPING": { - "Node": "/DEV8049/SYSTEM/AWG/CHANNELGROUPING", - "Description": "Sets the channel grouping mode of the device.", - "Properties": "Read, Write, Setting", - "Type": "Integer (enumerated)", - "Unit": "None", - "Options": { - "0": "Use the outputs in groups of 2. One sequencer program controls 2 outputs ", - "1": "Use the outputs in groups of 4. One sequencer program controls 4 outputs ", - "2": "Use the outputs in groups of 8. One sequencer program controls 8 outputs " - } - }, "/DEV8049/SIGOUTS/0/ON": { - "Node": "/DEV8049/SIGOUTS/0/ON", - "Description": "Enabling/Disabling the Signal Output. Corresponds to the blue LED indicator", - "Properties": "Read, Write, Setting", - "Type": "Integer (64 bit)", - "Unit": "None" - }, "/DEV8049/SYSTEM/OWNER": { - "Node": "/DEV8049/SYSTEM/OWNER", - "Description": "Returns the current owner of the device (IP).", - "Properties": "Read", - "Type": "String", - "Unit": "None" - }, "/DEV8049/SINES/0/AMPLITUDES/0": { - "Node": "/DEV8049/SINES/0/AMPLITUDES/0", - "Description": "Sets the peak amplitude that the sine signal contributes to the signal output. Note that\ - the last index is either 0 or 1 and will map to the pair of outputs given by the first index.\ - (e.g. sines/3/amplitudes/0 corresponds to wave output 2)", - "Properties": "Read, Write, Setting", - "Type": "Double", - "Unit": "None" - }, "/DEV8049/AWGS/1/WAVEFORM/MEMORYUSAGE": { - "Node": "/DEV8049/AWGS/1/WAVEFORM/MEMORYUSAGE", - "Description": "Amount of the used waveform data relative to the device cache memory. The cache memory \ - provides space for 32 kSa of waveform data. Memory Usage over 100% means that waveforms must be loaded from\ - the main memory (128 MSa per channel) during playback, which can lead to delays.", - "Properties": "Read", - "Type": "Double", - "Unit": "%" - }} - - def test_create_parameters_from_node_tree(self): - with patch.object(zhinst.utils, 'create_api_session', - return_value=3 * (MagicMock(),)), \ - patch.object(ZIHDAWG8, 'download_device_node_tree', - return_value=self.node_tree): - hdawg8 = ZIHDAWG8('hdawg8', 'dev-test') - - self.assertIn('system_awg_channelgrouping', hdawg8.parameters) - with self.assertRaises(ValueError): - hdawg8.system_awg_channelgrouping.set(4) - self.assertEqual('None', hdawg8.system_awg_channelgrouping.unit) - self.assertEqual('system_awg_channelgrouping', - hdawg8.system_awg_channelgrouping.name) - self.assertIsNotNone(hdawg8.system_awg_channelgrouping.vals) - self.assertIsInstance(hdawg8.system_awg_channelgrouping.vals, - validators.Enum) - - self.assertIn('sigouts_0_on', hdawg8.parameters) - self.assertEqual('None', hdawg8.sigouts_0_on.unit) - self.assertEqual('sigouts_0_on', hdawg8.sigouts_0_on.name) - self.assertIsNone(hdawg8.sigouts_0_on.vals) - - self.assertIn('system_owner', hdawg8.parameters) - self.assertEqual('None', hdawg8.system_owner.unit) - self.assertEqual('system_owner', hdawg8.system_owner.name) - self.assertIsNone(hdawg8.system_owner.vals) - - self.assertIn('sines_0_amplitudes_0', hdawg8.parameters) - self.assertEqual('None', hdawg8.sines_0_amplitudes_0.unit) - self.assertEqual('sines_0_amplitudes_0', - hdawg8.sines_0_amplitudes_0.name) - self.assertIsNone(hdawg8.sines_0_amplitudes_0.vals) - - self.assertIn('awgs_1_waveform_memoryusage', hdawg8.parameters) - self.assertEqual('%', hdawg8.awgs_1_waveform_memoryusage.unit) - self.assertEqual('awgs_1_waveform_memoryusage', - hdawg8.awgs_1_waveform_memoryusage.name) - self.assertIsNone(hdawg8.awgs_1_waveform_memoryusage.vals) - hdawg8.close() - - def test_generate_csv_sequence_program(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - wave wave_2 = "wave_2"; - wave wave_3 = "wave_3"; - - while(true){ - playWave(1, wave_1, 2, wave_2, 3, wave_3); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(1, 'wave_1', None), (2, 'wave_2', None), (3, 'wave_3', None)]) - self.assertEqual(expected, sequence_program) - - def test_generate_csv_sequence_program_1_wave(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - - while(true){ - playWave(7, wave_1); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(7, 'wave_1', None)]) - self.assertEqual(expected, sequence_program) - - def test_generate_csv_sequence_program_with_marker(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - wave marker_1 = "marker_1"; - wave_1 = wave_1 + marker_1; - - while(true){ - playWave(6, wave_1); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(6, 'wave_1', "marker_1")]) - self.assertEqual(expected, sequence_program) - - def test_generate_csv_sequence_program_with_marker_2_waves(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - wave marker_1 = "marker_1"; - wave_1 = wave_1 + marker_1; - wave wave_2 = "wave_2"; - - while(true){ - playWave(6, wave_1, 5, wave_2); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(6, 'wave_1', "marker_1"), (5, "wave_2", None)]) - self.assertEqual(expected, sequence_program) - - def test_generate_csv_sequence_program_with_marker_no_waves(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave marker_1 = "marker_1"; - - while(true){ - playWave(6, marker_1); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(6, None, "marker_1")]) - self.assertEqual(expected, sequence_program) - - def test_generate_csv_sequence_program_with_2_markers_1_wave(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - wave marker_1 = "marker_1"; - wave_1 = wave_1 + marker_1; - wave marker_2 = "marker_2"; - - while(true){ - playWave(1, wave_1, 2, marker_2); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(1, "wave_1", "marker_1"), (2, None, "marker_2")]) - self.assertEqual(expected, sequence_program) - - def test_generate_large_csv_sequence_program(self): - expected = textwrap.dedent(""" - // generated by qcodes.instrument_drivers.ZI.ZIHDAWG8 - - wave wave_1 = "wave_1"; - wave marker_1 = "marker_1"; - wave_1 = wave_1 + marker_1; - wave marker_2 = "marker_2"; - wave marker_3 = "marker_3"; - wave wave_4 = "wave_4"; - wave wave_5 = "wave_5"; - wave marker_5 = "marker_5"; - wave_5 = wave_5 + marker_5; - wave wave_6 = "wave_6"; - wave wave_7 = "wave_7"; - wave marker_7 = "marker_7"; - wave_7 = wave_7 + marker_7; - wave marker_8 = "marker_8"; - - while(true){ - playWave(1, wave_1, 2, marker_2, 3, marker_3, 4, wave_4, 5, wave_5, 6, wave_6, 7, wave_7, 8, marker_8); - } - """) - sequence_program = ZIHDAWG8.generate_csv_sequence_program( - [(1, "wave_1", "marker_1"), (2, None, "marker_2"), - (3, None, "marker_3"), (4, "wave_4", None), - (5, "wave_5", "marker_5"), (6, "wave_6", None), - (7, "wave_7", "marker_7"), (8, None, "marker_8")]) - self.assertEqual(expected, sequence_program)