Indicator keyboard

Merge lp:~attente/indicator-keyboard/long-timeout into lp:indicator-keyboard

  1. long-timeout
  2. Merge into trunk
Proposed by William Hua
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 101
Merged at revision: 101
Proposed branch: lp:~attente/indicator-keyboard/long-timeout
Merge into: lp:indicator-keyboard
Diff against target: 114 lines (+12/-11)
2 files modified
po/indicator-keyboard.pot (+1/-1)
tests/main.vala (+11/-10)
To merge this branch: bzr merge lp:~attente/indicator-keyboard/long-timeout
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+181194@code.launchpad.net

Commit message

Use long delays in places when they may be killed prematurely.

Description of the change

Use long delays in places when they may be killed prematurely.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/16/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

The CI seems happy, let's see how that works!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/indicator-keyboard.pot'
2--- po/indicator-keyboard.pot 2013-08-12 01:33:27 +0000
3+++ po/indicator-keyboard.pot 2013-08-21 04:55:38 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2013-08-12 09:33+0800\n"
9+"POT-Creation-Date: 2013-08-21 12:15+0800\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13
14=== modified file 'tests/main.vala'
15--- tests/main.vala 2013-08-08 18:53:16 +0000
16+++ tests/main.vala 2013-08-21 04:55:38 +0000
17@@ -18,6 +18,7 @@
18
19 const int TIMEOUT_S = 1;
20 const int TIMEOUT_MS = 1000;
21+const int LONG_TIMEOUT_S = 10;
22
23 [DBus (name = "com.canonical.indicator.keyboard.test")]
24 public class Service : Object {
25@@ -193,7 +194,7 @@
26
27 action_group.activate_action ("map", null);
28
29- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
30+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
31 loop.run ();
32 Source.remove (source);
33 ((!) fixture.service).disconnect (signal_name);
34@@ -232,7 +233,7 @@
35
36 action_group.activate_action ("chart", null);
37
38- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
39+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
40 loop.run ();
41 Source.remove (source);
42 ((!) fixture.service).disconnect (signal_name);
43@@ -260,7 +261,7 @@
44
45 action_group.activate_action ("settings", null);
46
47- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
48+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
49 loop.run ();
50 Source.remove (source);
51 ((!) fixture.service).disconnect (signal_name);
52@@ -294,7 +295,7 @@
53 try {
54 var cancellable = new Cancellable ();
55
56- var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; });
57+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
58
59 var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
60 DBusProxyFlags.NONE,
61@@ -360,7 +361,7 @@
62 try {
63 var cancellable = new Cancellable ();
64
65- var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; });
66+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
67
68 var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
69 DBusProxyFlags.NONE,
70@@ -431,7 +432,7 @@
71
72 action_group.list_actions ();
73
74- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
75+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
76 loop.run ();
77 Source.remove (source);
78 action_group.disconnect (signal_name);
79@@ -455,7 +456,7 @@
80 return;
81 }
82
83- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
84+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
85 loop.run ();
86 Source.remove (source);
87 action_group.disconnect (signal_name);
88@@ -479,7 +480,7 @@
89 return;
90 }
91
92- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
93+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
94 loop.run ();
95 Source.remove (source);
96 action_group.disconnect (signal_name);
97@@ -564,7 +565,7 @@
98 return;
99 }
100
101- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
102+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
103 loop.run ();
104 Source.remove (source);
105 action_group.disconnect (signal_name);
106@@ -671,7 +672,7 @@
107 return;
108 }
109
110- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
111+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
112 loop.run ();
113 Source.remove (source);
114 section.disconnect (signal_name);

Subscribers

People subscribed via source and target branches

to all changes: