Merge lp:~pete-woods/hud/keyword-tests-non-english-locale into lp:hud/phablet

Proposed by Pete Woods
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 371
Merged at revision: 368
Proposed branch: lp:~pete-woods/hud/keyword-tests-non-english-locale
Merge into: lp:hud/phablet
Prerequisite: lp:~pete-woods/hud/relative-paths-in-tests
Diff against target: 44 lines (+14/-0)
1 file modified
tests/test-keyword-mapping.c (+14/-0)
To merge this branch: bzr merge lp:~pete-woods/hud/keyword-tests-non-english-locale
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+156624@code.launchpad.net

This proposal supersedes a proposal from 2013-04-02.

Commit message

Fix keyword tests on non-English locale

Description of the change

Fix keyword tests on non-English locale

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Tests pass here now :-)

review: Approve
Revision history for this message
Pete Woods (pete-woods) wrote :

> Tests pass here now :-)

Woot! Thanks for spending the extra time checking! :-D

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:371
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~pete-woods/hud/keyword-tests-non-english-locale/+merge/156624/+edit-commit-message

http://s-jenkins:8080/job/hud-small-ci/300/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/hud-small-ci/./build=pbuilder,distribution=quantal,flavor=i386/300

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-small-ci/300/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test-keyword-mapping.c'
2--- tests/test-keyword-mapping.c 2013-04-02 16:07:47 +0000
3+++ tests/test-keyword-mapping.c 2013-04-02 16:07:47 +0000
4@@ -69,8 +69,12 @@
5 GPtrArray *results, *results2;
6
7 mapping = hud_keyword_mapping_new ();
8+
9+ const gchar* original_language = get_language ();
10+ set_language ("en_EVENMOREFAKELANG");
11 hud_keyword_mapping_load (mapping, "gnome-terminal",
12 KEYWORD_MAPPING, KEYWORD_LOCALE_DIR);
13+ set_language (original_language);
14
15 results = hud_keyword_mapping_transform (mapping, "random action string");
16 g_assert_cmpint(results->len, ==, 0);
17@@ -91,8 +95,13 @@
18 GPtrArray* results;
19
20 mapping = hud_keyword_mapping_new ();
21+
22+ const gchar* original_language = get_language ();
23+ set_language ("en_EVENMOREFAKELANG");
24 hud_keyword_mapping_load (mapping, "gnome-terminal",
25 KEYWORD_MAPPING, KEYWORD_LOCALE_DIR);
26+ set_language (original_language);
27+
28 results = hud_keyword_mapping_transform (mapping, "Open Ta_b");
29
30 g_assert_cmpint(results->len, ==, 2);
31@@ -135,8 +144,13 @@
32 GPtrArray* results;
33
34 mapping = hud_keyword_mapping_new ();
35+
36+ const gchar* original_language = get_language ();
37+ set_language ("en_EVENMOREFAKELANG");
38 hud_keyword_mapping_load (mapping, "gnome-terminal", KEYWORD_MAPPING,
39 KEYWORD_LOCALE_DIR);
40+ set_language (original_language);
41+
42 results = hud_keyword_mapping_transform (mapping, "Open _Terminal");
43
44 g_assert_cmpint(results->len, ==, 2);

Subscribers

People subscribed via source and target branches