Fix #156: The MinorServo tests have to setup the ACS environment (39a5a748) · Commits · INAF / DISCOS

Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py

+20 −4

Original line number	Diff line number	Diff line
		@@ -9,26 +9,41 @@ import MinorServo
		import Management
		import Antenna

		from PyMinorServoTest import simunittest
		from Acspy.Clients.SimpleClient import PySimpleClient
		from MinorServoErrors import MinorServoErrorsEx
		from Acspy.Common.TimeHelper import getTimeStamp

		from acswrapper.system import acs
		from acswrapper.containers import (
		Container, ContainerError, start_containers_and_wait,
		stop_containers_and_wait
		)

		__author__ = "Marco Buttu <mbuttu@oa-cagliari.inaf.it>"


		class TestClearUserOffset(unittest.TestCase):

		telescope = os.getenv('STATION')

		@classmethod
		def setUpClass(cls):
		if not acs.is_running():
		acs.start()
		cls.containers = [
		Container('MinorServoContainer', 'cpp'),
		Container('MinorServoBossContainer', 'cpp'),
		]
		try:
		start_containers_and_wait(cls.containers)
		except ContainerError, ex:
		cls.fail(ex.message)

		cls.client = PySimpleClient()
		cls.boss = cls.client.getComponent('MINORSERVO/Boss')

		@classmethod
		def tearDownClass(cls):
		cls.client.releaseComponent('MINORSERVO/Boss')
		stop_containers_and_wait(cls.containers)

		def test_wrong_servo_name(self):
		"""Raise a MinorServoErrorsEx in case of wrong servo name"""
		@@ -39,4 +54,5 @@ if __name__ == '__main__':
		if 'Configuration' in os.getenv('ACS_CDB'):
		unittest.main() # Real test using the antenna CDB
		else:
		simunittest.run(TestClearUserOffset)
		from testing import simulator
		simulator.run(TestClearUserOffset, 'srt-mscu-sim')

+21 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,13 @@ from Acspy.Clients.SimpleClient import PySimpleClient
		from MinorServoErrors import MinorServoErrorsEx
		from Acspy.Common.TimeHelper import getTimeStamp


		from acswrapper.system import acs
		from acswrapper.containers import (
		Container, ContainerError, start_containers_and_wait,
		stop_containers_and_wait
		)

		__author__ = "Marco Buttu <mbuttu@oa-cagliari.inaf.it>"


		@@ -24,6 +31,17 @@ class TestGetAxesInfo(unittest.TestCase):

		@classmethod
		def setUpClass(cls):
		if not acs.is_running():
		acs.start()
		cls.containers = [
		Container('MinorServoContainer', 'cpp'),
		Container('MinorServoBossContainer', 'cpp'),
		]
		try:
		start_containers_and_wait(cls.containers)
		except ContainerError, ex:
		cls.fail(ex.message)

		cls.client = PySimpleClient()
		cls.boss = cls.client.getComponent('MINORSERVO/Boss')

		@@ -31,6 +49,7 @@ class TestGetAxesInfo(unittest.TestCase):
		def tearDownClass(cls):
		cls.client.releaseComponent('MINORSERVO/Boss')
		cls.client.disconnect()
		stop_containers_and_wait(cls.containers)

		def setUp(self):
		self.setup_code = "CCB" if self.telescope == "SRT" else "CCC"
		@@ -68,6 +87,6 @@ if __name__ == '__main__':
		if 'Configuration' in os.getenv('ACS_CDB'):
		unittest.main() # Real test using the antenna CDB
		else:
		from PyMinorServoTest import simunittest
		simunittest.run(TestGetAxesInfo)
		from testing import simulator
		simulator.run(TestGetAxesInfo, 'srt-mscu-sim')

+19 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,12 @@ from Acspy.Clients.SimpleClient import PySimpleClient
		from MinorServoErrors import MinorServoErrorsEx
		from Acspy.Common.TimeHelper import getTimeStamp

		from acswrapper.system import acs
		from acswrapper.containers import (
		Container, ContainerError, start_containers_and_wait,
		stop_containers_and_wait
		)

		__author__ = "Marco Buttu <mbuttu@oa-cagliari.inaf.it>"


		@@ -24,12 +30,23 @@ class TestGetAxesPosition(unittest.TestCase):

		@classmethod
		def setUpClass(cls):
		if not acs.is_running():
		acs.start()
		cls.containers = [
		Container('MinorServoContainer', 'cpp'),
		Container('MinorServoBossContainer', 'cpp'),
		]
		try:
		start_containers_and_wait(cls.containers)
		except ContainerError, ex:
		cls.fail(ex.message)
		cls.client = PySimpleClient()
		cls.boss = cls.client.getComponent('MINORSERVO/Boss')

		@classmethod
		def tearDownClass(cls):
		cls.client.releaseComponent('MINORSERVO/Boss')
		stop_containers_and_wait(cls.containers)

		def setUp(self):
		self.setup_code = "CCB" if self.telescope == "SRT" else "CCC"
		@@ -65,6 +82,6 @@ if __name__ == '__main__':
		if 'Configuration' in os.getenv('ACS_CDB'):
		unittest.main() # Real test using the antenna CDB
		else:
		from PyMinorServoTest import simunittest
		simunittest.run(TestGetAxesPosition)
		from testing import simulator
		simulator.run(TestGetAxesPosition, 'srt-mscu-sim')

+25 −2

Original line number	Diff line number	Diff line
		@@ -4,16 +4,38 @@ import os

		import unittest

		from PyMinorServoTest import simunittest
		from Acspy.Clients.SimpleClient import PySimpleClient
		from MinorServoErrors import MinorServoErrorsEx

		from acswrapper.system import acs
		from acswrapper.containers import (
		Container, ContainerError, start_containers_and_wait,
		stop_containers_and_wait
		)

		__author__ = "Marco Buttu <mbuttu@oa-cagliari.inaf.it>"

		class TestGetCentralScanPosition(unittest.TestCase):

		telescope = os.getenv('STATION')

		@classmethod
		def setUpClass(cls):
		if not acs.is_running():
		acs.start()
		cls.containers = [
		Container('MinorServoContainer', 'cpp'),
		Container('MinorServoBossContainer', 'cpp'),
		]
		try:
		start_containers_and_wait(cls.containers)
		except ContainerError, ex:
		cls.fail(ex.message)

		@classmethod
		def tearDownClass(cls):
		stop_containers_and_wait(cls.containers)

		def setUp(self):
		self.client = PySimpleClient()
		self.boss = self.client.getComponent('MINORSERVO/Boss')
		@@ -31,5 +53,6 @@ if __name__ == '__main__':
		if 'Configuration' in os.getenv('ACS_CDB'):
		unittest.main() # Real test using the antenna CDB
		else:
		simunittest.run(TestGetCentralScanPosition)
		from testing import simulator
		simulator.run(TestGetCentralScanPosition, 'srt-mscu-sim')

+20 −2

Original line number	Diff line number	Diff line
		@@ -15,20 +15,38 @@ from Acspy.Common.TimeHelper import getTimeStamp
		from Acspy.Clients.SimpleClient import PySimpleClient
		from Acspy.Util import ACSCorba

		from acswrapper.system import acs
		from acswrapper.containers import (
		Container, ContainerError, start_containers_and_wait,
		stop_containers_and_wait
		)

		__author__ = "Marco Buttu <mbuttu@oa-cagliari.inaf.it>"


		class PositionTest(unittest.TestCase):

		telescope = os.getenv('STATION')

		@classmethod
		def setUpClass(cls):
		if not acs.is_running():
		acs.start()
		cls.containers = [
		Container('MinorServoContainer', 'cpp'),
		Container('MinorServoBossContainer', 'cpp'),
		]
		try:
		start_containers_and_wait(cls.containers)
		except ContainerError, ex:
		cls.fail(ex.message)
		cls.client = PySimpleClient()
		cls.boss = cls.client.getComponent('MINORSERVO/Boss')

		@classmethod
		def tearDownClass(cls):
		cls.client.releaseComponent('MINORSERVO/Boss')
		stop_containers_and_wait(cls.containers)

		def setUp(self):
		self.axis_code='SRP_TZ' if self.telescope == 'SRT' else 'Z'
		@@ -104,5 +122,5 @@ if __name__ == '__main__':
		if 'Configuration' in os.getenv('ACS_CDB'):
		unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB
		else:
		from PyMinorServoTest import simunittest
		simunittest.run(PositionTest)
		from testing import simulator
		simulator.run(PositionTest, 'srt-mscu-sim')