From b13a92bcc01b92a296f3ae9bf3a98f3920216642 Mon Sep 17 00:00:00 2001 From: Stefano Nardo <stefano.nardo@santannapisa.it> Date: Fri, 3 Apr 2020 14:47:12 +0000 Subject: [PATCH] =?UTF-8?q?Fusion=20effectu=C3=A9e=20NRRPLT-7855-disable-d?= =?UTF-8?q?elete-model-service=20(pull=20request=20#21)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [NRRPLT-7855] disable reset world and reset full * [NRRPLT-7855] disable reset world and reset full * [NRRPLT-7855] fix unit tests Approuvé par : Michael Zechmair Approuvé par : Axel von Arnim --- .../hbp_nrp_virtual_coach/simulation.py | 4 ++++ .../hbp_nrp_virtual_coach/tests/test_simulation.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py index d11f978..6bba85b 100644 --- a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py +++ b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/simulation.py @@ -844,6 +844,10 @@ class Simulation(object): assert isinstance(reset_type, (str, unicode)) + # NRRPLT-7855 + if reset_type in ['full', 'world']: + raise ValueError('Reset %s temporarily disabled due to known Gazebo issue' % reset_type) + if reset_type not in self.__config['reset-services'].keys(): raise ValueError('Undefined reset type. Possible values are: %s' % ", ".join(self.__config['reset-services'].keys())) diff --git a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/tests/test_simulation.py b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/tests/test_simulation.py index 2e7ee9c..a69ff87 100644 --- a/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/tests/test_simulation.py +++ b/hbp_nrp_virtual_coach/hbp_nrp_virtual_coach/tests/test_simulation.py @@ -623,16 +623,20 @@ class TestSimulation(unittest.TestCase): self._sim._Simulation__http_client.put = Mock() self._sim._Simulation__http_client.put.return_value = (httplib.OK, None) - self._sim.reset('world') - self._sim._Simulation__http_client.put.assert_called_once() + # NRRPLT-7855 + self.assertRaises(ValueError, self._sim.reset, 'world') + # self._sim.reset('world') + # self._sim._Simulation__http_client.put.assert_called_once() self._sim._Simulation__http_client.put.return_value = (httplib.NOT_FOUND, None) self._sim.start = Mock() self.assertRaises(ValueError, self._sim.reset, 'foo') - self.assertRaises(Exception, self._sim.reset, 'full') - self._sim.start.assert_called_once() + # NRRPLT-7855 + self.assertRaises(ValueError, self._sim.reset, 'full') + # self.assertRaises(Exception, self._sim.reset, 'full') + # self._sim.start.assert_called_once() def test_get_csv_last_run_file(self): self._sim._Simulation__vc = Mock() -- GitLab