Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for false negative tests in rosbag2_py #1592

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Fix for false negative tests in rosbag2_py #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f5a0c
Fix for false negative tests in rosbag2_py
MichaelOrlov Mar 19, 2024
c47b619
Address review comments in regards bag_path optimization
MichaelOrlov Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rosbag2_py/test/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ def wait_for(
if clock.now() - start > timeout:
return False
time.sleep(sleep_time)
return True
return True
11 changes: 5 additions & 6 deletions rosbag2_py/test/test_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import datetime
from pathlib import Path
import threading

from common import get_rosbag_options, wait_for
Expand Down Expand Up @@ -44,8 +43,8 @@ def test_options_qos_conversion():

@pytest.mark.parametrize('storage_id', TESTED_STORAGE_IDS)
def test_record_cancel(tmp_path, storage_id):
bag_path = str(tmp_path / 'test_record_cancel')
storage_options, converter_options = get_rosbag_options(bag_path, storage_id)
bag_path = tmp_path / 'test_record_cancel'
storage_options, converter_options = get_rosbag_options(str(bag_path), storage_id)

recorder = rosbag2_py.Recorder()

Expand Down Expand Up @@ -78,12 +77,12 @@ def test_record_cancel(tmp_path, storage_id):
recorder.cancel()

metadata_io = rosbag2_py.MetadataIo()
assert wait_for(lambda: metadata_io.metadata_file_exists(bag_path),
assert wait_for(lambda: metadata_io.metadata_file_exists(str(bag_path)),
timeout=rclpy.duration.Duration(seconds=3))
record_thread.join()

metadata = metadata_io.read_metadata(bag_path)
metadata = metadata_io.read_metadata(str(bag_path))
assert len(metadata.relative_file_paths)
storage_path = Path(metadata.relative_file_paths[0])
storage_path = bag_path / metadata.relative_file_paths[0]
assert wait_for(lambda: storage_path.is_file(),
timeout=rclpy.duration.Duration(seconds=3))
Loading