aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-08-07 10:45:42 -0400
committerWilliam Hua <william.hua@canonical.com>2013-08-07 10:45:42 -0400
commit49783d7014a6f5342ec77f56e81aeab6954bc2ec (patch)
treeb93e8e984ff115b80d8eb440885a6c69ac0ebe2f
parent6d780dde682d74aa61756ad95c05f5bb1bb57b01 (diff)
downloadayatana-indicator-keyboard-49783d7014a6f5342ec77f56e81aeab6954bc2ec.tar.gz
ayatana-indicator-keyboard-49783d7014a6f5342ec77f56e81aeab6954bc2ec.tar.bz2
ayatana-indicator-keyboard-49783d7014a6f5342ec77f56e81aeab6954bc2ec.zip
Resolve flaky test by forcing a delay.
-rw-r--r--po/indicator-keyboard.pot8
-rw-r--r--tests/main.vala10
2 files changed, 6 insertions, 12 deletions
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index a96fdd39..4433c98f 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 18:00-0400\n"
+"POT-Creation-Date: 2013-08-07 10:44-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../lib/main.c:2297 ../lib/main.vala:532
+#: ../lib/main.c:2314 ../lib/main.vala:550
msgid "Character Map"
msgstr ""
-#: ../lib/main.c:2299 ../lib/main.vala:533
+#: ../lib/main.c:2316 ../lib/main.vala:551
msgid "Keyboard Layout Chart"
msgstr ""
-#: ../lib/main.c:2301 ../lib/main.vala:534
+#: ../lib/main.c:2318 ../lib/main.vala:552
msgid "Text Entry Settings..."
msgstr ""
diff --git a/tests/main.vala b/tests/main.vala
index a26eca55..09d612f1 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -150,18 +150,12 @@ static void test_activate_input_source (void *data) {
var action_group = DBusActionGroup.get ((!) fixture.connection,
"com.canonical.indicator.keyboard",
"/com/canonical/indicator/keyboard");
- var loop = new MainLoop (null, false);
- var signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
- loop.quit ();
- });
-
action_group.list_actions ();
action_group.activate_action ("current", new Variant.uint32 (2));
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var loop = new MainLoop (null, false);
+ Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
- Source.remove (source);
- action_group.disconnect (signal_name);
var state = action_group.get_action_state ("current");
var current = state.get_uint32 ();