diff options
author | Michael Catanzaro <mcatanzaro@igalia.com> | 2018-07-17 10:45:40 -0500 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2018-07-17 10:46:02 -0500 |
commit | 44dac9eae63223bce27d2a33bc6e43fd02c67923 (patch) | |
tree | 594bac3fc14d0bf1a6416db197ed8c1c3a708016 /tests | |
parent | bb52f9981448c5953d6d39a8eedbb34b34e398c5 (diff) | |
download | epiphany-44dac9eae63223bce27d2a33bc6e43fd02c67923.tar.gz |
Revert "Run ephy-migration-test in temporary profile dirs"
This reverts commit c7a44c90a47243a2e627a92d8535cfe491d49342.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ephy-migration-test.c | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c index 85d4afce5..c069585ee 100644 --- a/tests/ephy-migration-test.c +++ b/tests/ephy-migration-test.c @@ -25,58 +25,24 @@ #include "ephy-file-helpers.h" #include "ephy-profile-utils.h" -#include <errno.h> #include <gtk/gtk.h> -static char * -create_test_profile_dir (void) -{ - char *tmpdir; - GError *error = NULL; - - tmpdir = g_dir_make_tmp ("ephy-migration-test-XXXXXX", &error); - g_assert_no_error (error); - - return tmpdir; -} - -static void -delete_test_profile_dir (const char *tmpdir) -{ - gboolean ret; - GError *error = NULL; - - ret = ephy_file_delete_dir_recursively (tmpdir, &error); - g_assert_true (ret); - g_assert_no_error (error); -} - static void test_do_migration_simple (void) { gboolean ret; - char *tmpdir; - - tmpdir = create_test_profile_dir (); - ret = ephy_profile_utils_do_migration (tmpdir, -1, TRUE); - g_assert_true (ret); - delete_test_profile_dir (tmpdir); - g_free (tmpdir); + ret = ephy_profile_utils_do_migration (NULL, -1, TRUE); + g_assert (ret); } static void test_do_migration_invalid (void) { gboolean ret; - char *tmpdir; - - tmpdir = create_test_profile_dir (); - ret = ephy_profile_utils_do_migration (tmpdir, EPHY_PROFILE_MIGRATION_VERSION + 1, TRUE); - g_assert_false (ret); - delete_test_profile_dir (tmpdir); - g_free (tmpdir); + ret = ephy_profile_utils_do_migration (NULL, EPHY_PROFILE_MIGRATION_VERSION + 1, TRUE); + g_assert (ret == FALSE); } int |