Skip to content
Snippets Groups Projects
Unverified Commit 215bbcea authored by Drew Devereux's avatar Drew Devereux
Browse files

[MCCS-585] Linting fixes from move to flake8

parent 1d33f027
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 36 deletions
...@@ -218,13 +218,13 @@ class CspSubElementObsDevice(SKAObsDevice): ...@@ -218,13 +218,13 @@ class CspSubElementObsDevice(SKAObsDevice):
def read_scanID(self): def read_scanID(self):
# PROTECTED REGION ID(CspSubElementObsDevice.scanID_read) ENABLED START # # PROTECTED REGION ID(CspSubElementObsDevice.scanID_read) ENABLED START #
"""Return the scanID attribute.""" """Return the scanID attribute."""
return self.component_manager.scan_id # pylint: disable=no-member return self.component_manager.scan_id
# PROTECTED REGION END # // CspSubElementObsDevice.scanID_read # PROTECTED REGION END # // CspSubElementObsDevice.scanID_read
def read_configurationID(self): def read_configurationID(self):
# PROTECTED REGION ID(CspSubElementObsDevice.configurationID_read) ENABLED START # # PROTECTED REGION ID(CspSubElementObsDevice.configurationID_read) ENABLED START #
"""Return the configurationID attribute.""" """Return the configurationID attribute."""
return self.component_manager.config_id # pylint: disable=no-member return self.component_manager.config_id
# PROTECTED REGION END # // CspSubElementObsDevice.configurationID_read # PROTECTED REGION END # // CspSubElementObsDevice.configurationID_read
def read_deviceID(self): def read_deviceID(self):
......
...@@ -3,8 +3,6 @@ This module models component management for CSP subelement observation devices. ...@@ -3,8 +3,6 @@ This module models component management for CSP subelement observation devices.
""" """
import functools import functools
from tango import DevState
from ska_tango_base.csp.obs import CspObsComponentManager from ska_tango_base.csp.obs import CspObsComponentManager
from ska_tango_base.base import check_communicating, ReferenceBaseComponentManager from ska_tango_base.base import check_communicating, ReferenceBaseComponentManager
......
...@@ -72,7 +72,9 @@ class CspSubElementSubarray(SKASubarray): ...@@ -72,7 +72,9 @@ class CspSubElementSubarray(SKASubarray):
dtype="DevString", dtype="DevString",
access=AttrWriteType.READ_WRITE, access=AttrWriteType.READ_WRITE,
label="sdpDestinationAddresses", label="sdpDestinationAddresses",
doc="JSON formatted string.\nReport the list of all the SDP addresses provided by SDP to receive the output products.\nSpecifies the Mac, IP, Port for each resource:CBF visibility channels, Pss pipelines, PSTBeam", doc="JSON formatted string.\nReport the list of all the SDP addresses provided "
"by SDP to receive the output products.\nSpecifies the Mac, IP, Port for each "
"resource:CBF visibility channels, Pss pipelines, PSTBeam",
) )
"""Device attribute.""" """Device attribute."""
...@@ -102,7 +104,9 @@ class CspSubElementSubarray(SKASubarray): ...@@ -102,7 +104,9 @@ class CspSubElementSubarray(SKASubarray):
listOfDevicesCompletedTasks = attribute( listOfDevicesCompletedTasks = attribute(
dtype="DevString", dtype="DevString",
label="listOfDevicesCompletedTasks", label="listOfDevicesCompletedTasks",
doc="JSON formatted string reporting for each task/command the list of devices\nthat completed successfully the task.\nEx.\n{``cmd1``: [``device1``, ``device2``], ``cmd2``: [``device2``, ``device3``]}", doc="JSON formatted string reporting for each task/command the list of devices"
"\nthat completed successfully the task.\nEx.\n{``cmd1``: [``device1``, "
"``device2``], ``cmd2``: [``device2``, ``device3``]}",
) )
"""Device attribute.""" """Device attribute."""
...@@ -309,13 +313,13 @@ class CspSubElementSubarray(SKASubarray): ...@@ -309,13 +313,13 @@ class CspSubElementSubarray(SKASubarray):
def read_scanID(self): def read_scanID(self):
# PROTECTED REGION ID(CspSubElementSubarray.scanID_read) ENABLED START # # PROTECTED REGION ID(CspSubElementSubarray.scanID_read) ENABLED START #
"""Return the scanID attribute.""" """Return the scanID attribute."""
return self.component_manager.scan_id # pylint: disable=no-member return self.component_manager.scan_id
# PROTECTED REGION END # // CspSubElementSubarray.scanID_read # PROTECTED REGION END # // CspSubElementSubarray.scanID_read
def read_configurationID(self): def read_configurationID(self):
# PROTECTED REGION ID(CspSubElementSubarray.configurationID_read) ENABLED START # # PROTECTED REGION ID(CspSubElementSubarray.configurationID_read) ENABLED START #
"""Return the configurationID attribute.""" """Return the configurationID attribute."""
return self.component_manager.config_id # pylint: disable=no-member return self.component_manager.config_id
# PROTECTED REGION END # // CspSubElementSubarray.configurationID_read # PROTECTED REGION END # // CspSubElementSubarray.configurationID_read
def read_sdpDestinationAddresses(self): def read_sdpDestinationAddresses(self):
......
...@@ -13,8 +13,6 @@ instead of just SKABaseDevice. ...@@ -13,8 +13,6 @@ instead of just SKABaseDevice.
# Additional import # Additional import
# PROTECTED REGION ID(SKAObsDevice.additionnal_import) ENABLED START # # PROTECTED REGION ID(SKAObsDevice.additionnal_import) ENABLED START #
import warnings
# Tango imports # Tango imports
from tango.server import run, attribute from tango.server import run, attribute
......
...@@ -3,8 +3,6 @@ This module models component management for SKA subarray devices. ...@@ -3,8 +3,6 @@ This module models component management for SKA subarray devices.
""" """
import functools import functools
from tango import DevState
from ska_tango_base.subarray import SubarrayComponentManager from ska_tango_base.subarray import SubarrayComponentManager
from ska_tango_base.base import ( from ska_tango_base.base import (
check_communicating, check_communicating,
......
...@@ -12,7 +12,6 @@ information like assigned resources, configured capabilities, etc. ...@@ -12,7 +12,6 @@ information like assigned resources, configured capabilities, etc.
""" """
# PROTECTED REGION ID(SKASubarray.additionnal_import) ENABLED START # # PROTECTED REGION ID(SKASubarray.additionnal_import) ENABLED START #
import json import json
import warnings
from tango import DebugIt from tango import DebugIt
from tango.server import run, attribute, command from tango.server import run, attribute, command
...@@ -295,7 +294,7 @@ class SKASubarray(SKAObsDevice): ...@@ -295,7 +294,7 @@ class SKASubarray(SKAObsDevice):
component_manager = self.target component_manager = self.target
component_manager.scan(argin) component_manager.scan(argin)
message = f"Scan command started" message = "Scan command started"
self.logger.info(message) self.logger.info(message)
return (ResultCode.STARTED, message) return (ResultCode.STARTED, message)
...@@ -639,7 +638,7 @@ class SKASubarray(SKAObsDevice): ...@@ -639,7 +638,7 @@ class SKASubarray(SKAObsDevice):
:return: Resources assigned to the device. :return: Resources assigned to the device.
""" """
return self.component_manager.assigned_resources # pylint: disable=no-member return self.component_manager.assigned_resources
# PROTECTED REGION END # // SKASubarray.assignedResources_read # PROTECTED REGION END # // SKASubarray.assignedResources_read
def read_configuredCapabilities(self): def read_configuredCapabilities(self):
...@@ -650,9 +649,7 @@ class SKASubarray(SKAObsDevice): ...@@ -650,9 +649,7 @@ class SKASubarray(SKAObsDevice):
:return: A list of capability types with no. of instances used :return: A list of capability types with no. of instances used
in the Subarray in the Subarray
""" """
return ( return self.component_manager.configured_capabilities
self.component_manager.configured_capabilities # pylint: disable=no-member
)
# PROTECTED REGION END # // SKASubarray.configuredCapabilities_read # PROTECTED REGION END # // SKASubarray.configuredCapabilities_read
# -------- # --------
......
""" """
A module defining a list of fixtures that are shared across all ska_tango_base tests. A module defining a list of fixtures that are shared across all ska_tango_base tests.
""" """
import importlib
import logging import logging
from queue import Empty, Queue from queue import Empty, Queue
......
...@@ -17,12 +17,15 @@ from ska_tango_base import SKAAlarmHandler ...@@ -17,12 +17,15 @@ from ska_tango_base import SKAAlarmHandler
from ska_tango_base.base import ReferenceBaseComponentManager from ska_tango_base.base import ReferenceBaseComponentManager
from ska_tango_base.control_model import AdminMode from ska_tango_base.control_model import AdminMode
# PROTECTED REGION ID(SKAAlarmHandler.test_additional_imports) ENABLED START # # PROTECTED REGION ID(SKAAlarmHandler.test_additional_imports) ENABLED START #
# PROTECTED REGION END # // SKAAlarmHandler.test_additional_imports # PROTECTED REGION END # // SKAAlarmHandler.test_additional_imports
# Device test case # Device test case
# PROTECTED REGION ID(SKAAlarmHandler.test_SKAAlarmHandler_decorators) ENABLED START # # PROTECTED REGION ID(SKAAlarmHandler.test_SKAAlarmHandler_decorators) ENABLED START #
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION END # // SKAAlarmHandler.test_SKAAlarmHandler_decorators # PROTECTED REGION END # // SKAAlarmHandler.test_SKAAlarmHandler_decorators
@pytest.mark.usefixtures("tango_context", "initialize_device")
class TestSKAAlarmHandler(object): class TestSKAAlarmHandler(object):
""" """
Test class for tests of the SKAAlarmHander device class. Test class for tests of the SKAAlarmHander device class.
......
...@@ -294,7 +294,7 @@ class TestCspSubElementSubarray(object): ...@@ -294,7 +294,7 @@ class TestCspSubElementSubarray(object):
def test_configureScanTimeoutExpiredFlag(self, tango_context): def test_configureScanTimeoutExpiredFlag(self, tango_context):
"""Test for timeoutExpiredFlag""" """Test for timeoutExpiredFlag"""
# PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START #
assert tango_context.device.configureScanTimeoutExpiredFlag == False assert not tango_context.device.configureScanTimeoutExpiredFlag
# PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag
# PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START #
...@@ -302,7 +302,7 @@ class TestCspSubElementSubarray(object): ...@@ -302,7 +302,7 @@ class TestCspSubElementSubarray(object):
def test_assignResourcesTimeoutExpiredFlag(self, tango_context): def test_assignResourcesTimeoutExpiredFlag(self, tango_context):
"""Test for timeoutExpiredFlag""" """Test for timeoutExpiredFlag"""
# PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START #
assert tango_context.device.assignResourcesTimeoutExpiredFlag == False assert not tango_context.device.assignResourcesTimeoutExpiredFlag
# PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag
# PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START #
...@@ -310,7 +310,7 @@ class TestCspSubElementSubarray(object): ...@@ -310,7 +310,7 @@ class TestCspSubElementSubarray(object):
def test_releaseResourcesTimeoutExpiredFlag(self, tango_context): def test_releaseResourcesTimeoutExpiredFlag(self, tango_context):
"""Test for timeoutExpiredFlag""" """Test for timeoutExpiredFlag"""
# PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START #
assert tango_context.device.releaseResourcesTimeoutExpiredFlag == False assert not tango_context.device.releaseResourcesTimeoutExpiredFlag
# PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag
# PROTECTED REGION ID(CspSubelementSubarray.test_ConfigureScan_decorators) ENABLED START # # PROTECTED REGION ID(CspSubelementSubarray.test_ConfigureScan_decorators) ENABLED START #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment