aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-09-03 04:40:57 +0800
committerXan Lopez <xan@igalia.com>2012-09-03 04:42:36 +0800
commita66dcf2c036c9760e9b6daddccd55077be0b052b (patch)
tree1955cabf6d50ac7637900f274b78dc2396ac6196
parent47f9f712bc8f8123bd50a1d54ea11abb6c823b01 (diff)
downloadgsoc2013-epiphany-a66dcf2c036c9760e9b6daddccd55077be0b052b.tar.gz
gsoc2013-epiphany-a66dcf2c036c9760e9b6daddccd55077be0b052b.tar.zst
gsoc2013-epiphany-a66dcf2c036c9760e9b6daddccd55077be0b052b.zip
tests: register the application explicitly
This usually happens in _run, it seems, but the tests don't do that, so we need to call this manually. Otherwise the test will fail with: (/home/xan/git/epiphany/build/tests/test-ephy-session:9865): GLib-GIO-CRITICAL **: g_application_list_actions: assertion `application->priv->is_registered' failed No idea why this has started happening only now. https://bugzilla.gnome.org/show_bug.cgi?id=682653
-rw-r--r--tests/ephy-session-test.c2
-rw-r--r--tests/ephy-shell-test.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/ephy-session-test.c b/tests/ephy-session-test.c
index 57b29fd2b..55454b25c 100644
--- a/tests/ephy-session-test.c
+++ b/tests/ephy-session-test.c
@@ -174,6 +174,8 @@ main (int argc, char *argv[])
_ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_TEST);
g_assert (ephy_shell);
+ g_application_register (G_APPLICATION (ephy_shell), NULL, NULL);
+
g_test_add_func ("/src/ephy-session/load",
test_ephy_session_load);
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c
index 84626ae26..8518de115 100644
--- a/tests/ephy-shell-test.c
+++ b/tests/ephy-shell-test.c
@@ -332,13 +332,14 @@ main (int argc, char *argv[])
ephy_debug_init ();
ephy_embed_prefs_init ();
- _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_PRIVATE);
-
if (!ephy_file_helpers_init (NULL, EPHY_FILE_HELPERS_PRIVATE_PROFILE | EPHY_FILE_HELPERS_ENSURE_EXISTS, NULL)) {
g_debug ("Something wrong happened with ephy_file_helpers_init()");
return -1;
}
+ _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_PRIVATE);
+ g_application_register (G_APPLICATION (ephy_shell), NULL, NULL);
+
g_test_add_func ("/src/ephy-shell/basic_embeds",
test_ephy_shell_basic_embeds);