From 150fe2b32bf18d5f0e4b0af5f803c66c7e179b56 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Thu, 20 Sep 2018 15:18:22 +0100 Subject: [PATCH] instrument/daq: Provide available devices in error message Display available daq devices in error message if requested device is unavailable. --- devlib/instrument/daq.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devlib/instrument/daq.py b/devlib/instrument/daq.py index fb97000..399e2c4 100644 --- a/devlib/instrument/daq.py +++ b/devlib/instrument/daq.py @@ -60,7 +60,8 @@ class DaqInstrument(Instrument): result = self.execute('list_devices') if result.status == Status.OK: if device_id not in result.data: - raise ValueError('Device "{}" is not found on the DAQ server.'.format(device_id)) + msg = 'Device "{}" is not found on the DAQ server. Available devices are: "{}"' + raise ValueError(msg.format(device_id, ', '.join(result.data))) elif result.status != Status.OKISH: raise HostError('Problem querying DAQ server: {}'.format(result.message))