Skip to content

Add regex checks for logger timestamps and PIDs #5

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add regex checks for logger timestamps and PIDs #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions test/utils/utils_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "base.hpp"
#include "test_helpers.h"
#include <regex>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move it to the separate block


#define MOCK_FILE_PTR (FILE *)0xBADBEEF
#define INVALID_ERRNO 42
Expand All @@ -25,9 +26,11 @@ std::string expected_message = "[ERROR UMF] utils_log_init: Logging output not "
FILE *expected_stream = stderr;
int expect_fput_count = 0;
int fput_count = 0;
std::string last_message;

int mock_fputs(const char *s, FILE *stream) {
fput_count++;
last_message = s;
if (!expected_message.empty()) {
EXPECT_STREQ(s, expected_message.c_str());
}
Expand Down Expand Up @@ -257,6 +260,7 @@ TEST_F(test, parseEnv) {
template <typename... Args> void helper_test_log(Args... args) {
fput_count = 0;
fflush_count = 0;
last_message.clear();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add empty line after this call.

utils_log(args...);
EXPECT_EQ(fput_count, expect_fput_count);
EXPECT_EQ(fflush_count, expect_fflush_count);
Expand Down Expand Up @@ -351,20 +355,24 @@ TEST_F(test, timestamp_log) {
expect_fput_count = 1;
expect_fflush_count = 1;
loggerConfig = {1, 0, LOG_DEBUG, LOG_DEBUG, stderr};
// TODO: for now we do not check output message,
// as it requires more sophisticated message validation (a.k.a regrex)
expected_message = "";
helper_test_log(LOG_DEBUG, MOCK_FN_NAME.c_str(), "%s", "example log");

std::regex r("^\\[\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2} DEBUG UMF\\] "
+ MOCK_FN_NAME + ": example log\\n$");
EXPECT_TRUE(std::regex_match(last_message, r));
Comment on lines +360 to +363
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you describe this regexp as a comment?

}

TEST_F(test, pid_log) {
expect_fput_count = 1;
expect_fflush_count = 1;
loggerConfig = {0, 1, LOG_DEBUG, LOG_DEBUG, stderr};
// TODO: for now we do not check output message,
// as it requires more sophisticated message validation (a.k.a regrex)
expected_message = "";
helper_test_log(LOG_DEBUG, MOCK_FN_NAME.c_str(), "%s", "example log");

std::regex r("^\\[PID:[0-9]+\\s+TID:[0-9]+\\s+DEBUG UMF\\] " + MOCK_FN_NAME +
": example log\\n$");
EXPECT_TRUE(std::regex_match(last_message, r));
}

TEST_F(test, log_fatal) {
Expand Down
Loading