emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

test: don't "uniqify" link names during test

This commit is contained in:
Dirk-Jan C. Binnema 2023-04-09 11:02:58 +03:00
parent 1868e4f977
commit e43452fa18
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mu-maildir.cc
View File

@ -155,7 +155,7 @@ get_target_fullpath(const std::string& src, const std::string& targetpath,
if (auto&& res = check_subdir(src, in_cur); !res)
return Err(std::move(res.error()));
char *srcfile{g_path_get_basename(src.c_str())};
const auto srcfile{to_string_gchar(g_path_get_basename(src.c_str()))};
/* create targetpath; note: make the filename *cough* unique by
* including a hash of the srcname in the targetname. This helps if
@ -165,15 +165,13 @@ get_target_fullpath(const std::string& src, const std::string& targetpath,
if (unique_names)
fulltargetpath = join_paths(targetpath,
in_cur ? "cur" : "new",
format("%u_%s",
format("%08x-%s",
g_str_hash(src.c_str()),
srcfile));
srcfile.c_str()));
else
fulltargetpath = join_paths(targetpath,
in_cur ? "cur" : "new",
srcfile);
g_free(srcfile);
srcfile.c_str());
return fulltargetpath;
}

2
lib/utils/mu-test-utils.cc
View File

@ -93,6 +93,8 @@ black_hole(void)
void
Mu::mu_test_init(int *argc, char ***argv)
{
g_setenv("MU_TEST", "yes", TRUE);
g_test_init(argc, argv, NULL);
if (!g_test_verbose())

2
lib/utils/mu-test-utils.hh
View File

@ -36,7 +36,7 @@ static inline std::string test_random_tmpdir() {
}
/**
* mu wrapper for g_test_init
* mu wrapper for g_test_init. Sets environment variable MU_TEST to 1.
*
* @param argc
* @param argv

6
mu/mu-cmd-find.cc
View File

@ -178,7 +178,11 @@ output_link(const Option<Message>& msg, const OutputInfo& info, const Options& o
else if (info.footer)
return true;
if (auto&& res = maildir_link(msg->path(), opts.find.linksdir); !res) {
/* during test, do not create "unique names" (i.e., names with path
* hashes), so we get a predictable result */
const auto unique_names{!g_getenv("MU_TEST")&&!g_test_initialized()};
if (auto&& res = maildir_link(msg->path(), opts.find.linksdir, unique_names); !res) {
res.error().fill_g_error(err);
return false;
}