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

Merge branch 'pr-1111'

Browse Source 
Fix a bunch of conflicts, tests.
This commit is contained in:
djcb
2018-08-18 10:29:40 +03:00
parent 84fce77d0a c5a17a9699
commit aa70bf1920
9 changed files with 147 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mu/mu-cmd-server.c
View File

@ -1211,7 +1211,7 @@ do_move (MuStore *store, unsigned docid, MuMsg *msg, const char *maildir,
sexp = mu_msg_to_sexp (msg, docid, NULL, MU_MSG_OPTION_VERIFY);
/* note, the :move t thing is a hint to the frontend that it
* could remove the particular header */
print_expr ("(:update %s :move %s :view)", sexp,
print_expr ("(:update %s :move %s :view %s)", sexp,
different_mdir ? "t" : "nil",
no_view ? "nil" : "t");
g_free (sexp);

16
mu/tests/test-mu-cmd.c
View File

@ -380,8 +380,9 @@ get_file_size (const char* path)
static void
test_mu_extract_02 (void)
{
gchar *cmdline, *output, *tmpdir;
gchar *att1, *att2;
gchar *cmdline, *output, *tmpdir;
gchar *att1, *att2;
size_t size;
tmpdir = test_mu_common_get_random_tmpdir();
@ -408,7 +409,8 @@ test_mu_extract_02 (void)
att1 = g_strdup_printf ("%s%ccuster.jpg", tmpdir, G_DIR_SEPARATOR);
att2 = g_strdup_printf ("%s%csittingbull.jpg", tmpdir, G_DIR_SEPARATOR);
g_assert_cmpint (get_file_size(att1),==,15960);
size = get_file_size(att1);
g_assert_true (size >= 15958 && size <= 15960);
g_assert_cmpint (get_file_size(att2),==,17674);
g_free (output);
@ -422,8 +424,9 @@ test_mu_extract_02 (void)
static void
test_mu_extract_03 (void)
{
gchar *cmdline, *output, *tmpdir;
gchar *att1, *att2;
gchar *cmdline, *output, *tmpdir;
gchar *att1, *att2;
size_t size;
tmpdir = test_mu_common_get_random_tmpdir();
@ -450,7 +453,8 @@ test_mu_extract_03 (void)
att1 = g_strdup_printf ("%s%ccuster.jpg", tmpdir, G_DIR_SEPARATOR);
att2 = g_strdup_printf ("%s%csittingbull.jpg", tmpdir, G_DIR_SEPARATOR);
g_assert_cmpint (get_file_size(att1),==,15960); /* should not exist */
size = get_file_size(att1);
g_assert_true (size >= 15958 && size <= 15960);
g_assert_cmpint (get_file_size(att2),==,-1);
g_free (output);