From 37ac28ac939df9150b7fb202b5e3262be2b2ed2d Mon Sep 17 00:00:00 2001 From: gmegh Date: Thu, 19 Oct 2023 10:30:30 +0900 Subject: [PATCH] updates from PR comments --- .../ts/standardscripts/maintel/apply_dof.py | 4 ++-- tests/test_maintel_apply_dof.py | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/python/lsst/ts/standardscripts/maintel/apply_dof.py b/python/lsst/ts/standardscripts/maintel/apply_dof.py index b91c49a60..37e5ec9f8 100644 --- a/python/lsst/ts/standardscripts/maintel/apply_dof.py +++ b/python/lsst/ts/standardscripts/maintel/apply_dof.py @@ -422,7 +422,7 @@ async def run(self) -> None: await self.assert_feasibility() await self.checkpoint("Applying DOF offset...") - offset_dof_data = self.mtcs.mtaos.cmd_offsetDOF.DataType() + offset_dof_data = self.mtcs.rem.mtaos.cmd_offsetDOF.DataType() for i, dof_offset in enumerate(self.dofs): offset_dof_data.value[i] = dof_offset - await self.mtcs.mtaos.cmd_offsetDOF.start(data=offset_dof_data) + await self.mtcs.rem.mtaos.cmd_offsetDOF.start(data=offset_dof_data) diff --git a/tests/test_maintel_apply_dof.py b/tests/test_maintel_apply_dof.py index 31dd9e4ce..a52e81b07 100644 --- a/tests/test_maintel_apply_dof.py +++ b/tests/test_maintel_apply_dof.py @@ -20,8 +20,8 @@ # along with this program. If not, see . import asyncio -import logging import random +import types import unittest import numpy as np @@ -32,8 +32,6 @@ random.seed(47) # for set_random_lsst_dds_partition_prefix -logging.basicConfig() - class TestApplyDOF( standardscripts.BaseScriptTestCase, unittest.IsolatedAsyncioTestCase @@ -47,14 +45,15 @@ async def basic_make_script(self, index): intended_usage=MTCSUsages.DryTest, log=self.script.log, ) - self.script.mtcs.mtaos.cmd_offsetDOF.DataType = unittest.mock.PropertyMock( - return_value=np.zeros(50).dtype + self.script.mtcs.rem.mtaos = unittest.mock.AsyncMock() + self.script.mtcs.rem.mtaos.attach_mock( + unittest.mock.Mock(return_value=types.SimpleNamespace(value=np.zeros(50))), + "DataType", ) - self.script.mtcs.mtaos.cmd_offsetDOF.start = self.apply_dofs + self.script.mtcs.rem.mtaos.cmd_offsetDOF.start = self.apply_dofs self.script.mtcs.assert_all_enabled = unittest.mock.AsyncMock() - self.script.mtcs.start_task = unittest.mock.AsyncMock() - self.state_0 = np.zeros(50) + self.state_0 = np.zeros(len(DOFName)) return (self.script,) @@ -89,6 +88,9 @@ async def test_run(self) -> None: # Run the script await self.run_script() + self.script.mtcs.mtaos.cmd_offsetDOF.DataType.assert_called() + self.script.mtcs.rem.mtaos.cmd_offsetDOF.start.assert_awaited_once() + assert all(self.state_0 == dofs) async def test_executable(self) -> None: