mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: use a function-specific token instead of a common one

Browse source 
This avoid false detections of the MARK token from other tetsts when
tests are run in parallel.
This commit is contained in:
Peter Hutterer 2021-10-12 11:08:01 +10:00 • committed by Wim Taymans
parent e7ac8adaa5
commit 36c1917a16
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/test-logger.c
View file

@ -497,6 +497,7 @@ PWTEST(logger_journal)
char buffer[1024] = {0}; char buffer[1024] = {0};
sd_journal *journal; sd_journal *journal;
int rc; int rc;
char token[64];
pw_init(0, NULL); pw_init(0, NULL);
@ -519,9 +520,10 @@ PWTEST(logger_journal)
sd_journal_seek_tail(journal); sd_journal_seek_tail(journal);
sd_journal_next(journal); sd_journal_next(journal);
spa_logt_info(iface, &topic, "MARK\n"); spa_scnprintf(token, sizeof(token), "MARK %s:%d", __func__, __LINE__);
spa_logt_info(iface, &topic, "%s", token);
result = find_in_journal(journal, "MARK", buffer, sizeof(buffer)); result = find_in_journal(journal, token, buffer, sizeof(buffer));
pwtest_int_eq((int)result, PWTEST_PASS); pwtest_int_eq((int)result, PWTEST_PASS);
pwtest_str_contains(buffer, "pwtest journal"); pwtest_str_contains(buffer, "pwtest journal");
@ -553,6 +555,7 @@ PWTEST(logger_journal_chain)
}; };
sd_journal *journal; sd_journal *journal;
int rc; int rc;
char token[64];
pw_init(0, NULL); pw_init(0, NULL);
pwtest_mkstemp(fname); pwtest_mkstemp(fname);
@ -585,8 +588,10 @@ PWTEST(logger_journal_chain)
sd_journal_seek_tail(journal); sd_journal_seek_tail(journal);
sd_journal_next(journal); sd_journal_next(journal);
spa_logt_info(iface, &topic, "MARK\n"); spa_scnprintf(token, sizeof(token), "MARK %s:%d", __func__, __LINE__);
result = find_in_journal(journal, "MARK", buffer, sizeof(buffer));
spa_logt_info(iface, &topic, "%s", token);
result = find_in_journal(journal, token, buffer, sizeof(buffer));
pwtest_int_eq((int)result, PWTEST_PASS); pwtest_int_eq((int)result, PWTEST_PASS);
pwtest_str_contains(buffer, "pwtest journal"); pwtest_str_contains(buffer, "pwtest journal");
@ -595,7 +600,7 @@ PWTEST(logger_journal_chain)
mark_line_found = false; mark_line_found = false;
fp = fopen(fname, "r"); fp = fopen(fname, "r");
while (fgets(buffer, sizeof(buffer), fp) != NULL) { while (fgets(buffer, sizeof(buffer), fp) != NULL) {
if (strstr(buffer, "MARK")) { if (strstr(buffer, token)) {
mark_line_found = true; mark_line_found = true;
pwtest_ptr_null(strstr(buffer, SPA_ANSI_RESET)); pwtest_ptr_null(strstr(buffer, SPA_ANSI_RESET));
pwtest_ptr_null(strstr(buffer, SPA_ANSI_RED)); pwtest_ptr_null(strstr(buffer, SPA_ANSI_RED));