alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* test-mu-maildir: fix regexp

Browse Source
This commit is contained in:
djcb
2013-05-27 05:48:19 -07:00
parent 92ec6f7584
commit bdf7ca65c7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/tests/test-mu-maildir.c
View File

@ -435,7 +435,8 @@ static void
assert_matches_regexp (const char *str, const char *rx) assert_matches_regexp (const char *str, const char *rx)
{ {
if (!g_regex_match_simple (rx, str, 0, 0)) { if (!g_regex_match_simple (rx, str, 0, 0)) {
g_warning ("%s does not match %s", str, rx); if (g_test_verbose ())
g_print ("%s does not match %s", str, rx);
g_assert (0); g_assert (0);
} }
} }
@ -477,10 +478,10 @@ test_mu_maildir_get_new_path_new (void)
for (i = 0; i != G_N_ELEMENTS(paths); ++i) { for (i = 0; i != G_N_ELEMENTS(paths); ++i) {
char *str, *newbase; char *str, *newbase;
str = mu_maildir_get_new_path(paths[i].oldpath, NULL, str = mu_maildir_get_new_path (paths[i].oldpath, NULL,
paths[i].flags, TRUE); paths[i].flags, TRUE);
newbase = g_path_get_basename (str); newbase = g_path_get_basename (str);
assert_matches_regexp (newbase, "\\d{6}-[[:xdigit:]]{6}-[[:alpha:]]+:2,.*"); assert_matches_regexp (newbase, "\\d{8}-[[:xdigit:]]{8}-[[:alpha:]]+(:2,.*)?");
g_free (newbase); g_free (newbase);
g_free(str); g_free(str);
} }