diff --git a/BlockServerToKafka/forwarder_config.py b/BlockServerToKafka/forwarder_config.py index 3cd8b36d..68e21268 100644 --- a/BlockServerToKafka/forwarder_config.py +++ b/BlockServerToKafka/forwarder_config.py @@ -40,10 +40,7 @@ def __init__( self.epics_protocol = epics_protocol def _create_streams(self, pvs: List[str]) -> List[StreamInfo]: - return [ - StreamInfo(pv, self.schema, self.topic, self.epics_protocol, 0) - for pv in pvs - ] # pyright: ignore + return [StreamInfo(pv, self.schema, self.topic, self.epics_protocol, 0) for pv in pvs] # pyright: ignore def create_forwarder_configuration(self, pvs: List[str]) -> bytes: return serialise_fc00(UpdateType.ADD, self._create_streams(pvs)) # pyright: ignore diff --git a/BlockServerToKafka/test_modules/test_block_server_monitor.py b/BlockServerToKafka/test_modules/test_block_server_monitor.py index c1980d18..12fb81ea 100644 --- a/BlockServerToKafka/test_modules/test_block_server_monitor.py +++ b/BlockServerToKafka/test_modules/test_block_server_monitor.py @@ -40,9 +40,7 @@ def test_WHEN_convert_one_char_to_string_THEN_returns_character( arr = [ord(c)] self.assertEqual(c, self.bs_monitor.convert_to_string(bytearray(arr))) - def test_WHEN_convert_many_chars_to_string_THEN_returns_characters( - self, mock_ca_channel - ): + def test_WHEN_convert_many_chars_to_string_THEN_returns_characters(self, mock_ca_channel): chars = "hello world" arr = [ord(c) for c in chars] self.assertEqual(chars, self.bs_monitor.convert_to_string(bytearray(arr))) @@ -67,9 +65,7 @@ def test_WHEN_convert_chars_with_null_at_start_THEN_nulls_removed( arr.insert(0, 0) self.assertEqual(chars, self.bs_monitor.convert_to_string(bytearray(arr))) - def test_WHEN_convert_chars_with_nulls_in_centre_THEN_nulls_removed( - self, mock_ca_channel - ): + def test_WHEN_convert_chars_with_nulls_in_centre_THEN_nulls_removed(self, mock_ca_channel): chars = "hello world" arr = [ord(c) for c in chars] arr.insert(4, 0) diff --git a/BlockServerToKafka/test_modules/test_forwarder_config.py b/BlockServerToKafka/test_modules/test_forwarder_config.py index 97958050..50b860d7 100644 --- a/BlockServerToKafka/test_modules/test_forwarder_config.py +++ b/BlockServerToKafka/test_modules/test_forwarder_config.py @@ -46,24 +46,18 @@ def setUp(self): self.config_with_two_blocks = [self.test_block_1, self.test_block_2] def test_WHEN_new_forwarder_config_created_THEN_returns_valid_flatbuffers(self): - output = self.kafka_forwarder.create_forwarder_configuration( - self.config_with_one_block - ) + output = self.kafka_forwarder.create_forwarder_configuration(self.config_with_one_block) self.assertTrue(self.is_flatbuffers(output)) def test_WHEN_new_forwarder_config_created_THEN_returns_configuration_update_containing_add_command( self, ): - raw_output = self.kafka_forwarder.create_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.create_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertEqual(output.config_change, UpdateType.ADD) def test_WHEN_forwarder_config_removed_THEN_output_has_correct_command_type(self): - raw_output = self.kafka_forwarder.remove_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.remove_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertEqual(output.config_change, UpdateType.REMOVE) @@ -75,9 +69,7 @@ def test_WHEN_all_pvs_removed_THEN_output_has_correct_command_type(self): def test_WHEN_new_forwarder_config_created_THEN_returns_flatbuffer_containing_streams_with_channels_and_converters( self, ): - raw_output = self.kafka_forwarder.create_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.create_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertNotEqual(0, len(output[1])) for stream in output[1]: @@ -92,9 +84,7 @@ def test_GIVEN_using_version_4_WHEN_new_forwarder_config_created_THEN_returns_JS epics_protocol=Protocol.PVA, # pyright: ignore noqa topic=self.test_topic, ) - raw_output = kafka_version_4.create_forwarder_configuration( - self.config_with_one_block - ) + raw_output = kafka_version_4.create_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertNotEqual(0, len(output[1])) for stream in output[1]: @@ -103,9 +93,7 @@ def test_GIVEN_using_version_4_WHEN_new_forwarder_config_created_THEN_returns_JS def test_GIVEN_configuration_with_one_block_WHEN_new_forwarder_config_created_THEN_returns_JSON_containing_one_stream( self, ): - raw_output = self.kafka_forwarder.create_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.create_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertEqual(1, len(output[1])) @@ -121,9 +109,7 @@ def test_GIVEN_configuration_with_two_block_WHEN_new_forwarder_config_created_TH def test_GIVEN_configuration_with_one_block_WHEN_new_forwarder_config_created_THEN_returns_block_pv_string( self, ): - raw_output = self.kafka_forwarder.create_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.create_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) stream = output[1][0] self.assertEqual(self.test_block_1, stream.channel) @@ -139,17 +125,13 @@ def test_GIVEN_configuration_with_two_blocks_WHEN_new_forwarder_config_created_T self.assertTrue(blk in [stream.channel for stream in output[1]]) def test_WHEN_removed_old_forwarder_THEN_JSON_returns_valid(self): - output = self.kafka_forwarder.remove_forwarder_configuration( - self.config_with_one_block - ) + output = self.kafka_forwarder.remove_forwarder_configuration(self.config_with_one_block) self.assertTrue(self.is_flatbuffers(output)) def test_GIVEN_configuration_with_one_block_WHEN_removed_old_forwarder_THEN_returns_JSON_containing_block_pv_string( self, ): - raw_output = self.kafka_forwarder.remove_forwarder_configuration( - self.config_with_one_block - ) + raw_output = self.kafka_forwarder.remove_forwarder_configuration(self.config_with_one_block) output = deserialise_fc00(raw_output) self.assertEqual(self.test_block_1, output[1][0].channel)