From 5667e744dab6147bcc494e6d5d897fd2488d73df Mon Sep 17 00:00:00 2001
From: kmadisa <kmadisa@ska.ac.za>
Date: Fri, 26 Jan 2018 14:26:43 +0200
Subject: [PATCH] Fixing tests to compare attribute return values with tuples
instead of lists.
---
.../SKAAlarmHandler/test/SKAAlarmHandler_test.py | 2 +-
skabase/SKABaseDevice/test/SKABaseDevice_test.py | 2 +-
skabase/SKACapability/test/SKACapability_test.py | 2 +-
skabase/SKALogger/test/SKALogger_test.py | 4 ++--
skabase/SKAMaster/test/SKAMaster_test.py | 4 ++--
skabase/SKAObsDevice/test/SKAObsDevice_test.py | 2 +-
skabase/SKASubarray/test/SKASubarray_test.py | 14 +++++++-------
skabase/SKATelState/test/SKATelState_test.py | 2 +-
skabase/SKATestDevice/test/SKATestDevice_test.py | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py b/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
index d1bb8e88..9e21cbce 100644
--- a/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
+++ b/skabase/SKAAlarmHandler/test/SKAAlarmHandler_test.py
@@ -143,7 +143,7 @@ class TestSKAAlarmHandler(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAAlarmHandler.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAAlarmHandler.test_GetVersionInfo
diff --git a/skabase/SKABaseDevice/test/SKABaseDevice_test.py b/skabase/SKABaseDevice/test/SKABaseDevice_test.py
index 5be9e47d..3f80d57d 100644
--- a/skabase/SKABaseDevice/test/SKABaseDevice_test.py
+++ b/skabase/SKABaseDevice/test/SKABaseDevice_test.py
@@ -93,7 +93,7 @@ class TestSKABaseDevice(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKABaseDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKABaseDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKABaseDevice.test_Reset_decorators) ENABLED START #
diff --git a/skabase/SKACapability/test/SKACapability_test.py b/skabase/SKACapability/test/SKACapability_test.py
index 5470b177..ffaf7bcc 100644
--- a/skabase/SKACapability/test/SKACapability_test.py
+++ b/skabase/SKACapability/test/SKACapability_test.py
@@ -104,7 +104,7 @@ class TestSKACapability(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKACapability.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKACapability.test_GetVersionInfo
# PROTECTED REGION ID(SKACapability.test_ConfigureInstances_decorators) ENABLED START #
diff --git a/skabase/SKALogger/test/SKALogger_test.py b/skabase/SKALogger/test/SKALogger_test.py
index 903f3472..55b7d042 100644
--- a/skabase/SKALogger/test/SKALogger_test.py
+++ b/skabase/SKALogger/test/SKALogger_test.py
@@ -64,7 +64,7 @@ class TestSKALogger(object):
def test_Log(self, tango_context):
"""Test for Log"""
# PROTECTED REGION ID(SKALogger.test_Log) ENABLED START #
- assert tango_context.device.Log(("",)) == None
+ assert tango_context.device.Log([""]) == None
# PROTECTED REGION END # // SKALogger.test_Log
# PROTECTED REGION ID(SKALogger.test_State_decorators) ENABLED START #
@@ -128,7 +128,7 @@ class TestSKALogger(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKALogger.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKALogger.test_GetVersionInfo
# PROTECTED REGION ID(SKALogger.test_Reset_decorators) ENABLED START #
diff --git a/skabase/SKAMaster/test/SKAMaster_test.py b/skabase/SKAMaster/test/SKAMaster_test.py
index a2114ea0..481f1386 100644
--- a/skabase/SKAMaster/test/SKAMaster_test.py
+++ b/skabase/SKAMaster/test/SKAMaster_test.py
@@ -96,7 +96,7 @@ class TestSKAMaster(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAMaster.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAMaster.test_GetVersionInfo
# PROTECTED REGION ID(SKAMaster.test_isCapabilityAchievable_decorators) ENABLED START #
@@ -104,7 +104,7 @@ class TestSKAMaster(object):
def test_isCapabilityAchievable(self, tango_context):
"""Test for isCapabilityAchievable"""
# PROTECTED REGION ID(SKAMaster.test_isCapabilityAchievable) ENABLED START #
- assert tango_context.device.isCapabilityAchievable(([0], [""])) == False
+ assert tango_context.device.isCapabilityAchievable([[0], [""]]) == False
# PROTECTED REGION END # // SKAMaster.test_isCapabilityAchievable
# PROTECTED REGION ID(SKAMaster.test_Reset_decorators) ENABLED START #
diff --git a/skabase/SKAObsDevice/test/SKAObsDevice_test.py b/skabase/SKAObsDevice/test/SKAObsDevice_test.py
index 0dd9f1b9..b231c4e7 100644
--- a/skabase/SKAObsDevice/test/SKAObsDevice_test.py
+++ b/skabase/SKAObsDevice/test/SKAObsDevice_test.py
@@ -101,7 +101,7 @@ class TestSKAObsDevice(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKAObsDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKAObsDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKAObsDevice.test_Reset_decorators) ENABLED START #
diff --git a/skabase/SKASubarray/test/SKASubarray_test.py b/skabase/SKASubarray/test/SKASubarray_test.py
index 31783e34..1da0a440 100644
--- a/skabase/SKASubarray/test/SKASubarray_test.py
+++ b/skabase/SKASubarray/test/SKASubarray_test.py
@@ -71,7 +71,7 @@ class TestSKASubarray(object):
def test_ConfigureCapability(self, tango_context):
"""Test for ConfigureCapability"""
# PROTECTED REGION ID(SKASubarray.test_ConfigureCapability) ENABLED START #
- assert tango_context.device.ConfigureCapability(([0], [""])) == None
+ assert tango_context.device.ConfigureCapability([[0], [""]]) == None
# PROTECTED REGION END # // SKASubarray.test_ConfigureCapability
# PROTECTED REGION ID(SKASubarray.test_DeconfigureAllCapabilities_decorators) ENABLED START #
@@ -87,7 +87,7 @@ class TestSKASubarray(object):
def test_DeconfigureCapability(self, tango_context):
"""Test for DeconfigureCapability"""
# PROTECTED REGION ID(SKASubarray.test_DeconfigureCapability) ENABLED START #
- assert tango_context.device.DeconfigureCapability(([0], [""])) == None
+ assert tango_context.device.DeconfigureCapability([[0], [""]]) == None
# PROTECTED REGION END # // SKASubarray.test_DeconfigureCapability
# PROTECTED REGION ID(SKASubarray.test_GetMetrics_decorators) ENABLED START #
@@ -103,7 +103,7 @@ class TestSKASubarray(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKASubarray.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKASubarray.test_GetVersionInfo
# PROTECTED REGION ID(SKASubarray.test_Status_decorators) ENABLED START #
@@ -127,7 +127,7 @@ class TestSKASubarray(object):
def test_AssignResources(self, tango_context):
"""Test for AssignResources"""
# PROTECTED REGION ID(SKASubarray.test_AssignResources) ENABLED START #
- assert tango_context.device.AssignResources(("",)) == ("",)
+ assert tango_context.device.AssignResources([""]) == [""]
# PROTECTED REGION END # // SKASubarray.test_AssignResources
# PROTECTED REGION ID(SKASubarray.test_EndSB_decorators) ENABLED START #
@@ -167,7 +167,7 @@ class TestSKASubarray(object):
def test_ReleaseAllResources(self, tango_context):
"""Test for ReleaseAllResources"""
# PROTECTED REGION ID(SKASubarray.test_ReleaseAllResources) ENABLED START #
- assert tango_context.device.ReleaseAllResources() == ("",)
+ assert tango_context.device.ReleaseAllResources() == [""]
# PROTECTED REGION END # // SKASubarray.test_ReleaseAllResources
# PROTECTED REGION ID(SKASubarray.test_ReleaseResources_decorators) ENABLED START #
@@ -175,7 +175,7 @@ class TestSKASubarray(object):
def test_ReleaseResources(self, tango_context):
"""Test for ReleaseResources"""
# PROTECTED REGION ID(SKASubarray.test_ReleaseResources) ENABLED START #
- assert tango_context.device.ReleaseResources(("",)) == ("",)
+ assert tango_context.device.ReleaseResources([""]) == [""]
# PROTECTED REGION END # // SKASubarray.test_ReleaseResources
# PROTECTED REGION ID(SKASubarray.test_Reset_decorators) ENABLED START #
@@ -199,7 +199,7 @@ class TestSKASubarray(object):
def test_Scan(self, tango_context):
"""Test for Scan"""
# PROTECTED REGION ID(SKASubarray.test_Scan) ENABLED START #
- assert tango_context.device.Scan(("",)) == None
+ assert tango_context.device.Scan([""]) == None
# PROTECTED REGION END # // SKASubarray.test_Scan
# PROTECTED REGION ID(SKASubarray.test_ToJson_decorators) ENABLED START #
diff --git a/skabase/SKATelState/test/SKATelState_test.py b/skabase/SKATelState/test/SKATelState_test.py
index 07b53a98..802c8351 100644
--- a/skabase/SKATelState/test/SKATelState_test.py
+++ b/skabase/SKATelState/test/SKATelState_test.py
@@ -94,7 +94,7 @@ class TestSKATelState(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKATelState.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKATelState.test_GetVersionInfo
# PROTECTED REGION ID(SKATelState.test_Reset_decorators) ENABLED START #
diff --git a/skabase/SKATestDevice/test/SKATestDevice_test.py b/skabase/SKATestDevice/test/SKATestDevice_test.py
index 4730ad6c..a6b12e8f 100644
--- a/skabase/SKATestDevice/test/SKATestDevice_test.py
+++ b/skabase/SKATestDevice/test/SKATestDevice_test.py
@@ -81,7 +81,7 @@ class TestSKATestDevice(object):
def test_GetVersionInfo(self, tango_context):
"""Test for GetVersionInfo"""
# PROTECTED REGION ID(SKATestDevice.test_GetVersionInfo) ENABLED START #
- assert tango_context.device.GetVersionInfo() == ("",)
+ assert tango_context.device.GetVersionInfo() == [""]
# PROTECTED REGION END # // SKATestDevice.test_GetVersionInfo
# PROTECTED REGION ID(SKATestDevice.test_State_decorators) ENABLED START #
--
GitLab