More spdlog tests #40
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Scott K Logan <logans@cottsay.net>
Signed-off-by: Scott K Logan <logans@cottsay.net>
cottsay
commented
Jun 2, 2020
Comment on lines
+54
to
+56
| } else if (severity == 0 && level == 10) { | ||
| // This is a special case - not sure what the right behavior is | ||
| expected_log << ss.str() << std::endl; |
There was a problem hiding this comment.
I called this out on Slack - not sure what the expected behavior should be here, so for now I'm just asserting the current behavior.
cottsay
commented
Jun 2, 2020
rcl_logging_spdlog/test/fixtures.hpp
Outdated
Comment on lines
81
to
103
| std::stringstream dir_command; | ||
| dir_command << "dir"; | ||
| #ifdef _WIN32 | ||
| dir_command << " /B"; | ||
| #endif | ||
| dir_command << " " << (log_dir / get_expected_log_prefix()).string() << "*"; | ||
|
|
||
| FILE * fp = popen(dir_command.str().c_str(), "r"); | ||
| if (nullptr == fp) { | ||
| throw std::runtime_error("Failed to glob for log files"); | ||
| } | ||
|
|
||
| char raw_line[2048]; | ||
| while (fgets(raw_line, sizeof(raw_line), fp) != NULL) { | ||
| pclose(fp); | ||
|
|
||
| std::string line(raw_line); | ||
| fs::path line_path(line.substr(0, line.find_last_not_of(" \t\r\n") + 1)); | ||
| // This should be changed once ros2/rcpputils#68 is resolved | ||
| return line_path.is_absolute() ? line_path : log_dir / line_path; | ||
| } | ||
|
|
||
| pclose(fp); |
There was a problem hiding this comment.
Pretty much all of this should be replaced with properly iterating the directory content to find the log file, but that functionality isn't available in the filesystem helper. So either we need to implement it, or we need to bump to C++17, because this is kinda gross. (Post-Foxy)
cottsay
commented
Jun 2, 2020
rcl_logging_spdlog/test/fixtures.hpp
Outdated
Comment on lines
110
to
117
| char * exe_name = rcutils_get_executable_name(allocator); | ||
| if (nullptr == exe_name) { | ||
| throw std::runtime_error("Failed to determine executable name"); | ||
| } | ||
| std::stringstream prefix; | ||
| prefix << exe_name << "_" << | ||
| rcutils_get_pid() << "_"; | ||
| allocator.deallocate(exe_name, allocator.state); |
There was a problem hiding this comment.
We should support get_executable_name in rcpputils to avoid the need for an allocator here. Post-Foxy, of course.
Signed-off-by: Scott K Logan <logans@cottsay.net>
Signed-off-by: Scott K Logan <logans@cottsay.net>
hidmic
reviewed
Jun 2, 2020
Signed-off-by: Scott K Logan <logans@cottsay.net>
|
I haven't reviewed the changes closely, but you have my blessing to merge pending approval. Since it's only test code, I think it's okay delay it's release into Foxy. |
Signed-off-by: Scott K Logan <logans@cottsay.net>
Signed-off-by: Scott K Logan <logans@cottsay.net>
hidmic
reviewed
Jun 4, 2020
hidmic
approved these changes
Jun 4, 2020
Signed-off-by: Scott K Logan <logans@cottsay.net>
cottsay
force-pushed
the
more_spdlog_tests
branch
from
31f5f67
to
a68f7ae
Compare
brawner
approved these changes
Jun 4, 2020
Merged
ahcorde
pushed a commit
that referenced
this pull request
Oct 8, 2020
Signed-off-by: Scott K Logan <logans@cottsay.net>
ahcorde
pushed a commit
that referenced
this pull request
Oct 9, 2020
Signed-off-by: Scott K Logan <logans@cottsay.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As suggested in #36 (comment), some of this approach takes after #37.