Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve merge conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
morlov-apexai committed Jan 28, 2025
1 parent ff27b81 commit 1782bca
Showing 2 changed files with 1 addition and 10 deletions.
Original file line number Diff line number Diff line change
@@ -33,9 +33,6 @@ class TemporaryDirectoryFixture : public Test
public:
TemporaryDirectoryFixture()
{
<<<<<<< HEAD
temporary_dir_path_ = rcpputils::fs::create_temp_directory("tmp_test_dir_").string();
=======
std::filesystem::path parent_path = std::filesystem::path("/tmpfs");
if (!std::filesystem::exists(parent_path)) {
std::cerr << "The '/tmpfs' doesn't exist, falling back to the default temp directory \n";
@@ -44,12 +41,11 @@ class TemporaryDirectoryFixture : public Test

temporary_dir_path_ =
rcpputils::fs::create_temporary_directory("tmp_test_dir_", parent_path).string();
>>>>>>> 1d60d7b (Use tmpfs in rosbag2 temporary_directory_fixture (#1901))
}

~TemporaryDirectoryFixture() override
{
rcpputils::fs::remove_all(rcpputils::fs::path(temporary_dir_path_));
std::filesystem::remove_all(std::filesystem::path(temporary_dir_path_));
}

std::string temporary_dir_path_;
5 changes: 0 additions & 5 deletions rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
Original file line number Diff line number Diff line change
@@ -55,12 +55,7 @@ class TestRewrite : public ParametrizedTemporaryDirectoryFixture
public:
TestRewrite()
{
<<<<<<< HEAD
auto tmp_dir = rcpputils::fs::create_temp_directory("test_bag_rewrite");
output_dir_ = fs::path(tmp_dir.string());
=======
output_dir_ = fs::path(temporary_dir_path_);
>>>>>>> 1d60d7b (Use tmpfs in rosbag2 temporary_directory_fixture (#1901))
storage_id_ = GetParam();
bags_path_ = fs::path(_SRC_RESOURCES_DIR_PATH) / storage_id_;
}

0 comments on commit 1782bca

Please sign in to comment.