From 54a7eca6bee570a8c64a83511ce017e86999a6d7 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 21 Oct 2021 17:07:10 +0200 Subject: [PATCH] Use current APIs --- tests/test_writer.py | 2 +- tools/bench/bench.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_writer.py b/tests/test_writer.py index 7124ff37..5fac0e13 100644 --- a/tests/test_writer.py +++ b/tests/test_writer.py @@ -81,7 +81,7 @@ def test_failure_cases(tmp_path: Path): bag = Writer(tmp_path / 'write') with pytest.raises(WriterError, match='was not opened'): - bag.write('/tf', 0, b'') + bag.write(Connection(1, 0, '/tf', 'tf_msgs/msg/tf2', 'cdr', ''), 0, b'') bag = Writer(tmp_path / 'topic') bag.open() diff --git a/tools/bench/bench.py b/tools/bench/bench.py index d759a805..cb6d876a 100644 --- a/tools/bench/bench.py +++ b/tools/bench/bench.py @@ -84,16 +84,16 @@ def compare(path: Path): with Reader(path) as reader: gens = (reader.messages(), ReaderPy(path).messages()) for item, item_py in zip(*gens): - topic, msgtype, timestamp, data = item + connection, timestamp, data = item topic_py, msgtype_py, timestamp_py, data_py = item_py - assert topic == topic_py - assert msgtype == msgtype_py + assert connection.topic == topic_py + assert connection.msgtype == msgtype_py assert timestamp == timestamp_py assert data == data_py msg_py = deserialize_py(data_py, msgtype_py) - msg = deserialize_cdr(data, msgtype) + msg = deserialize_cdr(data, connection.msgtype) compare_msg(msg, msg_py) assert len(list(gens[0])) == 0 @@ -118,8 +118,8 @@ def read_deser_rosbag2_py(path: Path): def read_deser_rosbag2(path: Path): """Read testbag with rosbag2lite.""" with Reader(path) as reader: - for _, msgtype, _, data in reader.messages(): - deserialize_cdr(data, msgtype) + for connection, _, data in reader.messages(): + deserialize_cdr(data, connection.msgtype) def main():