From a884b16da1f5549f10f40c32e777a2b977ea6e84 Mon Sep 17 00:00:00 2001
From: kmadisa <kmadisa@ska.ac.za>
Date: Wed, 24 Jan 2018 17:23:24 +0200
Subject: [PATCH] Fixing syntax error.
---
.../test/SKAAlarmHandler_test.py | 12 +++++-----
skabase/SKABaseDevice/SKABaseDevice.xmi | 2 +-
.../SKABaseDevice/SKABaseDevice.py | 2 +-
.../SKABaseDevice/test/SKABaseDevice_test.py | 8 +++----
.../SKACapability/test/SKACapability_test.py | 10 ++++-----
skabase/SKALogger/test/SKALogger_test.py | 8 +++----
skabase/SKAMaster/test/SKAMaster_test.py | 8 +++----
.../SKAObsDevice/test/SKAObsDevice_test.py | 10 ++++-----
.../SKASubarray/SKASubarray/SKASubarray.py | 12 +++++-----
skabase/SKASubarray/test/SKASubarray_test.py | 22 +++++++++----------
skabase/SKATelState/test/SKATelState_test.py | 8 +++----
.../SKATestDevice/test/SKATestDevice_test.py | 8 +++----
12 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py b/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
index 950dc148..26c3123e 100644
--- a/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
+++ b/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKAAlarmHandler.test_SKAAlarmHandler_decorators) ENABLED START #
# PROTECTED REGION END # // SKAAlarmHandler.test_SKAAlarmHandler_decorators
-class TestSKAAlarmHandler(oject):
+class TestSKAAlarmHandler(object):
"""Test case for packet generation."""
properties = {
@@ -103,7 +103,7 @@ class TestSKAAlarmHandler(oject):
def test_GetAlarmStats(self, tango_context):
"""Test for GetAlarmStats"""
# PROTECTED REGION ID(SKAAlarmHandler.test_GetAlarmStats) ENABLED START #
- assert tango_context.device.GetAlarmStats(None) == ""
+ assert tango_context.device.GetAlarmStats() == ""
# PROTECTED REGION END # // SKAAlarmHandler.test_GetAlarmStats
# PROTECTED REGION ID(SKAAlarmHandler.test_GetAlertStats_decorators) ENABLED START #
@@ -111,7 +111,7 @@ class TestSKAAlarmHandler(oject):
def test_GetAlertStats(self, tango_context):
"""Test for GetAlertStats"""
# PROTECTED REGION ID(SKAAlarmHandler.test_GetAlertStats) ENABLED START #
- assert tango_context.device.GetAlertStats(None) == ""
+ assert tango_context.device.GetAlertStats() == ""
# PROTECTED REGION END # // SKAAlarmHandler.test_GetAlertStats
# PROTECTED REGION ID(SKAAlarmHandler.test_Reset_decorators) ENABLED START #
@@ -119,7 +119,7 @@ class TestSKAAlarmHandler(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKAAlarmHandler.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKAAlarmHandler.test_Reset
# PROTECTED REGION ID(SKAAlarmHandler.test_GetMetrics_decorators) ENABLED START #
@@ -127,7 +127,7 @@ class TestSKAAlarmHandler(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKAAlarmHandler.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKAAlarmHandler.test_GetMetrics
# PROTECTED REGION ID(SKAAlarmHandler.test_ToJson_decorators) ENABLED START #
@@ -143,7 +143,7 @@ class TestSKAAlarmHandler(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAAlarmHandler.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAAlarmHandler.test_GetVersionInfo
diff --git a/skabase/SKABaseDevice/SKABaseDevice.xmi b/skabase/SKABaseDevice/SKABaseDevice.xmi
index b2653bce..130216d0 100644
--- a/skabase/SKABaseDevice/SKABaseDevice.xmi
+++ b/skabase/SKABaseDevice/SKABaseDevice.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKABaseDevice" pogoRevision="9.6">
- <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/levpro/skabase/SKAAlarmHandler/../SKABaseDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="GPL" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/levpro/skabase/SKABaseDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="GPL" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKABaseDevice"/>
</description>
diff --git a/skabase/SKABaseDevice/SKABaseDevice/SKABaseDevice.py b/skabase/SKABaseDevice/SKABaseDevice/SKABaseDevice.py
index 0295ec2d..fccbac63 100644
--- a/skabase/SKABaseDevice/SKABaseDevice/SKABaseDevice.py
+++ b/skabase/SKABaseDevice/SKABaseDevice/SKABaseDevice.py
@@ -465,7 +465,7 @@ class SKABaseDevice(Device):
@DebugIt()
def Reset(self):
# PROTECTED REGION ID(SKABaseDevice.Reset) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKABaseDevice.Reset
# ----------
diff --git a/skabase/SKABaseDevice/test/SKABaseDevice_test.py b/skabase/SKABaseDevice/test/SKABaseDevice_test.py
index 9c302154..2b4f08ab 100644
--- a/skabase/SKABaseDevice/test/SKABaseDevice_test.py
+++ b/skabase/SKABaseDevice/test/SKABaseDevice_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKABaseDevice.test_SKABaseDevice_decorators) ENABLED START #
# PROTECTED REGION END # // SKABaseDevice.test_SKABaseDevice_decorators
-class TestSKABaseDevice(oject):
+class TestSKABaseDevice(object):
"""Test case for packet generation."""
properties = {
@@ -77,7 +77,7 @@ class TestSKABaseDevice(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKABaseDevice.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKABaseDevice.test_GetMetrics
# PROTECTED REGION ID(SKABaseDevice.test_ToJson_decorators) ENABLED START #
@@ -93,7 +93,7 @@ class TestSKABaseDevice(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKABaseDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKABaseDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKABaseDevice.test_Reset_decorators) ENABLED START #
@@ -101,7 +101,7 @@ class TestSKABaseDevice(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKABaseDevice.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKABaseDevice.test_Reset
diff --git a/skabase/SKACapability/test/SKACapability_test.py b/skabase/SKACapability/test/SKACapability_test.py
index f2c3da0a..7209d63a 100644
--- a/skabase/SKACapability/test/SKACapability_test.py
+++ b/skabase/SKACapability/test/SKACapability_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKACapability.test_SKACapability_decorators) ENABLED START #
# PROTECTED REGION END # // SKACapability.test_SKACapability_decorators
-class TestSKACapability(oject):
+class TestSKACapability(object):
"""Test case for packet generation."""
properties = {
@@ -64,7 +64,7 @@ class TestSKACapability(oject):
def test_ObsState(self, tango_context):
"""Test for ObsState"""
# PROTECTED REGION ID(SKACapability.test_ObsState) ENABLED START #
- assert tango_context.device.ObsState(None) == ""
+ assert tango_context.device.ObsState() == ""
# PROTECTED REGION END # // SKACapability.test_ObsState
# PROTECTED REGION ID(SKACapability.test_State_decorators) ENABLED START #
@@ -88,7 +88,7 @@ class TestSKACapability(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKACapability.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKACapability.test_GetMetrics
# PROTECTED REGION ID(SKACapability.test_ToJson_decorators) ENABLED START #
@@ -104,7 +104,7 @@ class TestSKACapability(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKACapability.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKACapability.test_GetVersionInfo
# PROTECTED REGION ID(SKACapability.test_ConfigureInstances_decorators) ENABLED START #
@@ -120,7 +120,7 @@ class TestSKACapability(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKACapability.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKACapability.test_Reset
diff --git a/skabase/SKALogger/test/SKALogger_test.py b/skabase/SKALogger/test/SKALogger_test.py
index 1b8deeb8..3d8f905f 100644
--- a/skabase/SKALogger/test/SKALogger_test.py
+++ b/skabase/SKALogger/test/SKALogger_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKALogger.test_SKALogger_decorators) ENABLED START #
# PROTECTED REGION END # // SKALogger.test_SKALogger_decorators
-class TestSKALogger(oject):
+class TestSKALogger(object):
"""Test case for packet generation."""
properties = {
@@ -112,7 +112,7 @@ class TestSKALogger(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKALogger.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKALogger.test_GetMetrics
# PROTECTED REGION ID(SKALogger.test_ToJson_decorators) ENABLED START #
@@ -128,7 +128,7 @@ class TestSKALogger(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKALogger.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKALogger.test_GetVersionInfo
# PROTECTED REGION ID(SKALogger.test_Reset_decorators) ENABLED START #
@@ -136,7 +136,7 @@ class TestSKALogger(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKALogger.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKALogger.test_Reset
diff --git a/skabase/SKAMaster/test/SKAMaster_test.py b/skabase/SKAMaster/test/SKAMaster_test.py
index bd7ea013..4fd9405c 100644
--- a/skabase/SKAMaster/test/SKAMaster_test.py
+++ b/skabase/SKAMaster/test/SKAMaster_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKAMaster.test_SKAMaster_decorators) ENABLED START #
# PROTECTED REGION END # // SKAMaster.test_SKAMaster_decorators
-class TestSKAMaster(oject):
+class TestSKAMaster(object):
"""Test case for packet generation."""
properties = {
@@ -80,7 +80,7 @@ class TestSKAMaster(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKAMaster.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKAMaster.test_GetMetrics
# PROTECTED REGION ID(SKAMaster.test_ToJson_decorators) ENABLED START #
@@ -96,7 +96,7 @@ class TestSKAMaster(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAMaster.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAMaster.test_GetVersionInfo
# PROTECTED REGION ID(SKAMaster.test_isCapabilityAchievable_decorators) ENABLED START #
@@ -112,7 +112,7 @@ class TestSKAMaster(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKAMaster.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKAMaster.test_Reset
diff --git a/skabase/SKAObsDevice/test/SKAObsDevice_test.py b/skabase/SKAObsDevice/test/SKAObsDevice_test.py
index cec8cc09..5d537129 100644
--- a/skabase/SKAObsDevice/test/SKAObsDevice_test.py
+++ b/skabase/SKAObsDevice/test/SKAObsDevice_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKAObsDevice.test_SKAObsDevice_decorators) ENABLED START #
# PROTECTED REGION END # // SKAObsDevice.test_SKAObsDevice_decorators
-class TestSKAObsDevice(oject):
+class TestSKAObsDevice(object):
"""Test case for packet generation."""
properties = {
@@ -61,7 +61,7 @@ class TestSKAObsDevice(oject):
def test_ObsState(self, tango_context):
"""Test for ObsState"""
# PROTECTED REGION ID(SKAObsDevice.test_ObsState) ENABLED START #
- assert tango_context.device.ObsState(None) == ""
+ assert tango_context.device.ObsState() == ""
# PROTECTED REGION END # // SKAObsDevice.test_ObsState
# PROTECTED REGION ID(SKAObsDevice.test_State_decorators) ENABLED START #
@@ -85,7 +85,7 @@ class TestSKAObsDevice(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKAObsDevice.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKAObsDevice.test_GetMetrics
# PROTECTED REGION ID(SKAObsDevice.test_ToJson_decorators) ENABLED START #
@@ -101,7 +101,7 @@ class TestSKAObsDevice(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAObsDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAObsDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKAObsDevice.test_Reset_decorators) ENABLED START #
@@ -109,7 +109,7 @@ class TestSKAObsDevice(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKAObsDevice.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKAObsDevice.test_Reset
diff --git a/skabase/SKASubarray/SKASubarray/SKASubarray.py b/skabase/SKASubarray/SKASubarray/SKASubarray.py
index 57a0e5ad..23bff212 100644
--- a/skabase/SKASubarray/SKASubarray/SKASubarray.py
+++ b/skabase/SKASubarray/SKASubarray/SKASubarray.py
@@ -306,7 +306,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def Abort(self):
# PROTECTED REGION ID(SKASubarray.Abort) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.Abort
@command(
@@ -414,7 +414,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def EndSB(self):
# PROTECTED REGION ID(SKASubarray.EndSB) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.EndSB
@command(
@@ -422,7 +422,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def EndScan(self):
# PROTECTED REGION ID(SKASubarray.EndScan) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.EndScan
@command(
@@ -430,7 +430,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def Pause(self):
# PROTECTED REGION ID(SKASubarray.Pause) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.Pause
@command(
@@ -462,7 +462,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def Resume(self):
# PROTECTED REGION ID(SKASubarray.Resume) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.Resume
@command(
@@ -471,7 +471,7 @@ class SKASubarray(SKAObsDevice):
@DebugIt()
def Scan(self, argin):
# PROTECTED REGION ID(SKASubarray.Scan) ENABLED START #
- return None
+ pass
# PROTECTED REGION END # // SKASubarray.Scan
# ----------
diff --git a/skabase/SKASubarray/test/SKASubarray_test.py b/skabase/SKASubarray/test/SKASubarray_test.py
index 8bbc89c6..1be8061a 100644
--- a/skabase/SKASubarray/test/SKASubarray_test.py
+++ b/skabase/SKASubarray/test/SKASubarray_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKASubarray.test_SKASubarray_decorators) ENABLED START #
# PROTECTED REGION END # // SKASubarray.test_SKASubarray_decorators
-class TestSKASubarray(oject):
+class TestSKASubarray(object):
"""Test case for packet generation."""
properties = {
@@ -63,7 +63,7 @@ class TestSKASubarray(oject):
def test_Abort(self, tango_context):
"""Test for Abort"""
# PROTECTED REGION ID(SKASubarray.test_Abort) ENABLED START #
- assert tango_context.device.Abort(None) == None
+ assert tango_context.device.Abort() == None
# PROTECTED REGION END # // SKASubarray.test_Abort
# PROTECTED REGION ID(SKASubarray.test_ConfigureCapability_decorators) ENABLED START #
@@ -95,7 +95,7 @@ class TestSKASubarray(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKASubarray.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKASubarray.test_GetMetrics
# PROTECTED REGION ID(SKASubarray.test_GetVersionInfo_decorators) ENABLED START #
@@ -103,7 +103,7 @@ class TestSKASubarray(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKASubarray.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKASubarray.test_GetVersionInfo
# PROTECTED REGION ID(SKASubarray.test_Status_decorators) ENABLED START #
@@ -135,7 +135,7 @@ class TestSKASubarray(oject):
def test_EndSB(self, tango_context):
"""Test for EndSB"""
# PROTECTED REGION ID(SKASubarray.test_EndSB) ENABLED START #
- assert tango_context.device.EndSB(None) == None
+ assert tango_context.device.EndSB() == None
# PROTECTED REGION END # // SKASubarray.test_EndSB
# PROTECTED REGION ID(SKASubarray.test_EndScan_decorators) ENABLED START #
@@ -143,7 +143,7 @@ class TestSKASubarray(oject):
def test_EndScan(self, tango_context):
"""Test for EndScan"""
# PROTECTED REGION ID(SKASubarray.test_EndScan) ENABLED START #
- assert tango_context.device.EndScan(None) == None
+ assert tango_context.device.EndScan() == None
# PROTECTED REGION END # // SKASubarray.test_EndScan
# PROTECTED REGION ID(SKASubarray.test_ObsState_decorators) ENABLED START #
@@ -151,7 +151,7 @@ class TestSKASubarray(oject):
def test_ObsState(self, tango_context):
"""Test for ObsState"""
# PROTECTED REGION ID(SKASubarray.test_ObsState) ENABLED START #
- assert tango_context.device.ObsState(None) == ""
+ assert tango_context.device.ObsState() == ""
# PROTECTED REGION END # // SKASubarray.test_ObsState
# PROTECTED REGION ID(SKASubarray.test_Pause_decorators) ENABLED START #
@@ -159,7 +159,7 @@ class TestSKASubarray(oject):
def test_Pause(self, tango_context):
"""Test for Pause"""
# PROTECTED REGION ID(SKASubarray.test_Pause) ENABLED START #
- assert tango_context.device.Pause(None) == None
+ assert tango_context.device.Pause() == None
# PROTECTED REGION END # // SKASubarray.test_Pause
# PROTECTED REGION ID(SKASubarray.test_ReleaseAllResources_decorators) ENABLED START #
@@ -167,7 +167,7 @@ class TestSKASubarray(oject):
def test_ReleaseAllResources(self, tango_context):
"""Test for ReleaseAllResources"""
# PROTECTED REGION ID(SKASubarray.test_ReleaseAllResources) ENABLED START #
- assert tango_context.device.ReleaseAllResources(None) == [""]
+ assert tango_context.device.ReleaseAllResources() == [""]
# PROTECTED REGION END # // SKASubarray.test_ReleaseAllResources
# PROTECTED REGION ID(SKASubarray.test_ReleaseResources_decorators) ENABLED START #
@@ -183,7 +183,7 @@ class TestSKASubarray(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKASubarray.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKASubarray.test_Reset
# PROTECTED REGION ID(SKASubarray.test_Resume_decorators) ENABLED START #
@@ -191,7 +191,7 @@ class TestSKASubarray(oject):
def test_Resume(self, tango_context):
"""Test for Resume"""
# PROTECTED REGION ID(SKASubarray.test_Resume) ENABLED START #
- assert tango_context.device.Resume(None) == None
+ assert tango_context.device.Resume() == None
# PROTECTED REGION END # // SKASubarray.test_Resume
# PROTECTED REGION ID(SKASubarray.test_Scan_decorators) ENABLED START #
diff --git a/skabase/SKATelState/test/SKATelState_test.py b/skabase/SKATelState/test/SKATelState_test.py
index 77d2b594..37110fe7 100644
--- a/skabase/SKATelState/test/SKATelState_test.py
+++ b/skabase/SKATelState/test/SKATelState_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKATelState.test_SKATelState_decorators) ENABLED START #
# PROTECTED REGION END # // SKATelState.test_SKATelState_decorators
-class TestSKATelState(oject):
+class TestSKATelState(object):
"""Test case for packet generation."""
properties = {
@@ -78,7 +78,7 @@ class TestSKATelState(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKATelState.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKATelState.test_GetMetrics
# PROTECTED REGION ID(SKATelState.test_ToJson_decorators) ENABLED START #
@@ -94,7 +94,7 @@ class TestSKATelState(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKATelState.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKATelState.test_GetVersionInfo
# PROTECTED REGION ID(SKATelState.test_Reset_decorators) ENABLED START #
@@ -102,7 +102,7 @@ class TestSKATelState(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKATelState.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKATelState.test_Reset
diff --git a/skabase/SKATestDevice/test/SKATestDevice_test.py b/skabase/SKATestDevice/test/SKATestDevice_test.py
index 4b50205e..558ffdc8 100644
--- a/skabase/SKATestDevice/test/SKATestDevice_test.py
+++ b/skabase/SKATestDevice/test/SKATestDevice_test.py
@@ -30,7 +30,7 @@ from PyTango import DevState
@pytest.mark.usefixtures("tango_context", "initialize_device")
# PROTECTED REGION ID(SKATestDevice.test_SKATestDevice_decorators) ENABLED START #
# PROTECTED REGION END # // SKATestDevice.test_SKATestDevice_decorators
-class TestSKATestDevice(oject):
+class TestSKATestDevice(object):
"""Test case for packet generation."""
properties = {
@@ -65,7 +65,7 @@ class TestSKATestDevice(oject):
def test_GetMetrics(self, tango_context):
"""Test for GetMetrics"""
# PROTECTED REGION ID(SKATestDevice.test_GetMetrics) ENABLED START #
- assert tango_context.device.GetMetrics(None) == ""
+ assert tango_context.device.GetMetrics() == ""
# PROTECTED REGION END # // SKATestDevice.test_GetMetrics
# PROTECTED REGION ID(SKATestDevice.test_ToJson_decorators) ENABLED START #
@@ -81,7 +81,7 @@ class TestSKATestDevice(oject):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKATestDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo(None) == [""]
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKATestDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKATestDevice.test_State_decorators) ENABLED START #
@@ -113,7 +113,7 @@ class TestSKATestDevice(oject):
def test_Reset(self, tango_context):
"""Test for Reset"""
# PROTECTED REGION ID(SKATestDevice.test_Reset) ENABLED START #
- assert tango_context.device.Reset(None) == None
+ assert tango_context.device.Reset() == None
# PROTECTED REGION END # // SKATestDevice.test_Reset
--
GitLab