From a6b2695da8cc7ff952ad3c68e6263433e31106f4 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" <robin.mueller.m@gmail.com> Date: Mon, 6 Jul 2020 15:54:53 +0200 Subject: [PATCH] service 20 test commented out --- test/obsw_pus_service_test.py | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py index 7a77596..ef29c18 100644 --- a/test/obsw_pus_service_test.py +++ b/test/obsw_pus_service_test.py @@ -185,42 +185,42 @@ class TestService17(TestService): print("Testing Service 17 finished") super().tearDownClass() -class TestService20(TestService): # TODO: implement correctly - - @classmethod - def setUpClass(cls: TestService): - super().setUpClass() - LOGGER.info("Testing Service 20") - cls.wait_intervals = [1, 2, 3, 4, 5] - cls.wait_time = [1.5, 1.5, 2.2, 2.2, 2.0] - cls.data_reply_count = 0 - pack_service20_test_into(cls.test_queue) - - def test_Service20(self): - - assertion_dict = self.perform_testing_and_generate_assertion_dict() - # 3 x Mode changes - self.misc_expected = 3 - # 2 x Event per mode change - self.event_expected = 6 - self.data_reply_expected = 1 - # One reply generates an additional step. - self.tc_verify_step_counter += 1 - self.assertEqual(assertion_dict[AssertionDictKeys.TC_STEP_COUNT], - self.tc_verify_step_counter) - - self.assertEqual(self.data_reply_count, self.data_reply_expected) - super()._perform_generic_assertion_test(assertion_dict) - - def analyse_tm_info(self, tm_info_queue: Deque, assertion_dict: dict): - while not tm_info_queue.__len__() == 0: - current_tm_info = tm_info_queue.pop() - if current_tm_info[TmDictionaryKeys.SERVICE] == 1: - self.scan_for_respective_tc(current_tm_info) - if (current_tm_info[TmDictionaryKeys.SERVICE] == 8 and - current_tm_info[TmDictionaryKeys.SUBSERVICE] == 130): - self.data_reply_count += 1 - self._generic_mode_tm_check(current_tm_info, g.DUMMY_DEVICE_ID, [7401, 7400]) +# class TestService20(TestService): # TODO: implement correctly +# +# @classmethod +# def setUpClass(cls: TestService): +# super().setUpClass() +# LOGGER.info("Testing Service 20") +# cls.wait_intervals = [1, 2, 3, 4, 5] +# cls.wait_time = [1.5, 1.5, 2.2, 2.2, 2.0] +# cls.data_reply_count = 0 +# pack_service20_test_into(cls.test_queue) +# +# def test_Service20(self): +# +# assertion_dict = self.perform_testing_and_generate_assertion_dict() +# # 3 x Mode changes +# self.misc_expected = 3 +# # 2 x Event per mode change +# self.event_expected = 6 +# self.data_reply_expected = 1 +# # One reply generates an additional step. +# self.tc_verify_step_counter += 1 +# self.assertEqual(assertion_dict[AssertionDictKeys.TC_STEP_COUNT], +# self.tc_verify_step_counter) +# +# self.assertEqual(self.data_reply_count, self.data_reply_expected) +# super()._perform_generic_assertion_test(assertion_dict) +# +# def analyse_tm_info(self, tm_info_queue: Deque, assertion_dict: dict): +# while not tm_info_queue.__len__() == 0: +# current_tm_info = tm_info_queue.pop() +# if current_tm_info[TmDictionaryKeys.SERVICE] == 1: +# self.scan_for_respective_tc(current_tm_info) +# if (current_tm_info[TmDictionaryKeys.SERVICE] == 8 and +# current_tm_info[TmDictionaryKeys.SUBSERVICE] == 130): +# self.data_reply_count += 1 +# self._generic_mode_tm_check(current_tm_info, g.DUMMY_DEVICE_ID, [7401, 7400]) class TestService200(TestService): -- GitLab