mirror of https://github.com/djcb/mu.git
mu: update unit tests
They need to use 'mu init' as well.
This commit is contained in:
parent
451309697d
commit
876f70d50d
|
@ -91,32 +91,6 @@ check_params (MuConfig *opts, GError **err)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
check_maildir (const char *maildir, GError **err)
|
|
||||||
{
|
|
||||||
if (!maildir) {
|
|
||||||
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
|
|
||||||
"no maildir to work on; use --maildir=");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!g_path_is_absolute (maildir)) {
|
|
||||||
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
|
|
||||||
"maildir path '%s' is not absolute",
|
|
||||||
maildir);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!mu_util_check_dir (maildir, TRUE, FALSE)) {
|
|
||||||
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
|
|
||||||
"not a valid Maildir: %s", maildir);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static MuError
|
static MuError
|
||||||
index_msg_silent_cb (MuIndexStats* stats, void *user_data)
|
index_msg_silent_cb (MuIndexStats* stats, void *user_data)
|
||||||
{
|
{
|
||||||
|
@ -290,9 +264,6 @@ init_mu_index (MuStore *store, MuConfig *opts, GError **err)
|
||||||
if (!check_params (opts, err))
|
if (!check_params (opts, err))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!check_maildir (opts->maildir, err))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
midx = mu_index_new (store, err);
|
midx = mu_index_new (store, err);
|
||||||
if (!midx)
|
if (!midx)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -40,10 +40,13 @@ fill_contacts_cache (void)
|
||||||
GError *err;
|
GError *err;
|
||||||
|
|
||||||
tmpdir = test_mu_common_get_random_tmpdir();
|
tmpdir = test_mu_common_get_random_tmpdir();
|
||||||
cmdline = g_strdup_printf ("%s index --muhome=%s --maildir=%s"
|
cmdline = g_strdup_printf (
|
||||||
" --quiet",
|
"/bin/sh -c '"
|
||||||
MU_PROGRAM,
|
"%s init --muhome=%s --maildir=%s --quiet; "
|
||||||
tmpdir, MU_TESTMAILDIR);
|
"%s index --muhome=%s --quiet'",
|
||||||
|
MU_PROGRAM, tmpdir, MU_TESTMAILDIR,
|
||||||
|
MU_PROGRAM, tmpdir);
|
||||||
|
|
||||||
if (g_test_verbose())
|
if (g_test_verbose())
|
||||||
g_print ("%s\n", cmdline);
|
g_print ("%s\n", cmdline);
|
||||||
|
|
||||||
|
|
|
@ -45,10 +45,12 @@ fill_database (void)
|
||||||
GError *err;
|
GError *err;
|
||||||
|
|
||||||
tmpdir = test_mu_common_get_random_tmpdir();
|
tmpdir = test_mu_common_get_random_tmpdir();
|
||||||
cmdline = g_strdup_printf ("%s index --muhome=%s --maildir=%s"
|
cmdline = g_strdup_printf (
|
||||||
" --quiet",
|
"/bin/sh -c '"
|
||||||
MU_PROGRAM,
|
"%s init --muhome=%s --maildir=%s --quiet; "
|
||||||
tmpdir, MU_TESTMAILDIR2);
|
"%s index --muhome=%s --quiet'",
|
||||||
|
MU_PROGRAM, tmpdir, MU_TESTMAILDIR2,
|
||||||
|
MU_PROGRAM, tmpdir);
|
||||||
if (g_test_verbose())
|
if (g_test_verbose())
|
||||||
g_print ("%s\n", cmdline);
|
g_print ("%s\n", cmdline);
|
||||||
|
|
||||||
|
@ -118,7 +120,7 @@ test_mu_index (void)
|
||||||
gchar *xpath;
|
gchar *xpath;
|
||||||
|
|
||||||
xpath = g_strdup_printf ("%s%c%s", DBPATH, G_DIR_SEPARATOR, "xapian");
|
xpath = g_strdup_printf ("%s%c%s", DBPATH, G_DIR_SEPARATOR, "xapian");
|
||||||
|
g_printerr ("*** %s\n", DBPATH);
|
||||||
store = mu_store_new_readable (xpath, NULL);
|
store = mu_store_new_readable (xpath, NULL);
|
||||||
g_assert (store);
|
g_assert (store);
|
||||||
|
|
||||||
|
|
|
@ -45,9 +45,13 @@ fill_database (const char *testdir)
|
||||||
gchar *cmdline, *tmpdir, *xpath;
|
gchar *cmdline, *tmpdir, *xpath;
|
||||||
|
|
||||||
tmpdir = test_mu_common_get_random_tmpdir();
|
tmpdir = test_mu_common_get_random_tmpdir();
|
||||||
cmdline = g_strdup_printf ("%s index --muhome=%s --maildir=%s"
|
cmdline = g_strdup_printf (
|
||||||
" --quiet",
|
"/bin/sh -c '"
|
||||||
MU_PROGRAM, tmpdir, testdir);
|
"%s init --muhome=%s --maildir=%s --quiet ; "
|
||||||
|
"%s index --muhome=%s --quiet'",
|
||||||
|
MU_PROGRAM, tmpdir, testdir,
|
||||||
|
MU_PROGRAM, tmpdir);
|
||||||
|
|
||||||
|
|
||||||
if (g_test_verbose())
|
if (g_test_verbose())
|
||||||
g_printerr ("\n%s\n", cmdline);
|
g_printerr ("\n%s\n", cmdline);
|
||||||
|
|
|
@ -99,9 +99,13 @@ fill_database (const char *testdir)
|
||||||
gchar *cmdline, *tmpdir, *xpath;
|
gchar *cmdline, *tmpdir, *xpath;
|
||||||
|
|
||||||
tmpdir = test_mu_common_get_random_tmpdir();
|
tmpdir = test_mu_common_get_random_tmpdir();
|
||||||
cmdline = g_strdup_printf ("%s index --muhome=%s --maildir=%s"
|
cmdline = g_strdup_printf (
|
||||||
" --quiet",
|
"/bin/sh -c '"
|
||||||
MU_PROGRAM, tmpdir, testdir);
|
"%s init --muhome=%s --maildir=%s --quiet ; "
|
||||||
|
"%s index --muhome=%s --quiet'",
|
||||||
|
MU_PROGRAM, tmpdir, testdir,
|
||||||
|
MU_PROGRAM, tmpdir);
|
||||||
|
|
||||||
if (g_test_verbose())
|
if (g_test_verbose())
|
||||||
g_print ("%s\n", cmdline);
|
g_print ("%s\n", cmdline);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue