Merge lp:~brandontschaefer/unity/lp.1211501-fix into lp:unity

[Brandon Schaefer]

Attempt to use more canonical words for the ibus AP tests, so we end up with a more used word, vs one the might change.

IBus AP tests retuning different preferences for typing cipan, which normally yields "disk" for me but according to the jenkins tests its returning a different word. Soo attempt to move to a more canonical word, replacing "disk" with "hello" and "disk management" to "management".

[Stephen M. Webb (bregma)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_ibus.py'
--- tests/autopilot/unity/tests/test_ibus.py	2013-08-05 17:48:02 +0000
+++ tests/autopilot/unity/tests/test_ibus.py	2013-08-12 20:39:47 +0000
@@ -216,8 +216,8 @@
         [
             ('photo', {'input': 'zhaopian ', 'result' : u'\u7167\u7247' }),
             ('internet', {'input': 'hulianwang ', 'result' : u'\u4e92\u8054\u7f51'}),
-            ('disk', {'input': 'cipan ', 'result' : u'\u78c1\u76d8' }),
-            ('disk_management', {'input': 'cipan guanli ', 'result' : u'\u78c1\u76d8\u7ba1\u7406' }),
+            ('hello', {'input': 'ninhao ', 'result' : u'\u60a8\u597d' }),
+            ('management', {'input': 'guanli ', 'result' : u'\u7ba1\u7406' }),
         ]
     )