finally fixed integration test

tangostationcontrol/tangostationcontrol/devices/observation_control.py

@@ -31,11 +31,15 @@ __all__ = ["ObservationControl", "main"]
 class obs(object):
     """ This class provides a pythonic interface to the ObservationControl and Observation devices on a station. """
 
-    def __init__(self, specification: dict, host: str = "localhost:10000"):
+    def __init__(self, specification: str, host: str = "localhost:10000"):
         # create device proxies to station at "host"
         self._observation_control_dev = DeviceProxy(f"tango://{host}/STAT/ObservationControl/1")
+
+        specification_dict = loads(specification)
         self._specification = specification
-        self._id = int(self._specification['properties']['observation_id'])
+
+        specification_dict = loads(specification)
+        self._id = int(specification_dict['observation_id'])
 
     def observation_id(self) -> int:
         return self._id

tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py

@@ -7,7 +7,7 @@ from tangostationcontrol.devices.observation_control import obs
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 import numpy
 
-from tango import DevState
+from tango import DevState, ApiUtil
 
 class TestObservation(base.IntegrationTestCase):
 
@@ -34,13 +34,13 @@ class TestObservation(base.IntegrationTestCase):
                                 ]
 
     def setUp(self):
-        self.observation_control_proxy = self.setup_ObservationControl_proxy()
         self.recv_proxy = self.setup_recv_proxy()
         self.antennafield_proxy = self.setup_antennafield_proxy()
         self.beamlet_proxy = self.setup_beamlet_proxy()
         self.sdp_proxy = self.setup_sdp_proxy()
         self.digitalbeam_proxy = self.setup_digitalbeam_proxy()
         self.tilebeam_proxy = self.setup_tilebeam_proxy()
+        self.observation_control_proxy = self.setup_ObservationControl_proxy()
 
 
     def setup_ObservationControl_proxy(self):
@@ -105,7 +105,9 @@ class TestObservation(base.IntegrationTestCase):
     def test_observation(self):
         """Test of the obs class basic functionality"""
 
-        observation = obs(specification=TestObservationBase.VALID_JSON, host="localhost:5703")
+        host = ApiUtil.get_env_var("TANGO_HOST")
+
+        observation = obs(specification=TestObservationBase.VALID_JSON, host=host)
 
         # Assert the observation is running after starting it
         observation.start()