diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py index c63a78363d343be702a2f2cd5addcf253ae1a82e..2c9960685ab3d702afdccedc10961122f9343da7 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py @@ -11,6 +11,7 @@ from tangostationcontrol.integration_test.base import BaseIntegrationTestCase from tangostationcontrol.toolkit.archiver import Archiver from tangostationcontrol.toolkit.retriever import RetrieverTimescale from tangostationcontrol.toolkit.archiver_util import attribute_fqdn +from tangostationcontrol.toolkit.archiver_configurator import get_multimember_devices from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy import time @@ -214,3 +215,13 @@ class TestArchiver(BaseIntegrationTestCase): records = self.retriever.get_lofar_attribute(attr_fullname) wait+=1 return records + + def test_get_multimember_devices(self): + """Test if multimember devices are correctly identified""" + config_dict = self.archiver.get_configuration() + self.assertIsNotNone(config_dict) + env_dict = config_dict['devices'] + matched_devices_dict = get_multimember_devices(env_dict) + self.assertIsNotNone(matched_devices_dict) + # TODO add assertions when multi-member devices will be added to TangoDB + diff --git a/tangostationcontrol/tangostationcontrol/toolkit/archiver_configurator.py b/tangostationcontrol/tangostationcontrol/toolkit/archiver_configurator.py index c38c69dc05f8028a9e7e3e7c250053c8b3a8f542..fb736057f992223773f6986d354ff558f9bbe33a 100644 --- a/tangostationcontrol/tangostationcontrol/toolkit/archiver_configurator.py +++ b/tangostationcontrol/tangostationcontrol/toolkit/archiver_configurator.py @@ -89,7 +89,6 @@ def get_multimember_devices(env_dict:dict): # Get a Tango DB reference tangodb = Database() # Scan configuration dictionary for possible multi-member devices - #matched_devices = [] matched_devices_dict = {} for device in env_dict: # Search for asterisk in device names