Unity

Merge lp:~sil2100/unity/autopilot_shopping_fix into lp:unity

  1. autopilot_shopping_fix
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2889
Proposed branch: lp:~sil2100/unity/autopilot_shopping_fix
Merge into: lp:unity
Diff against target: 77 lines (+10/-8)
1 file modified
tests/autopilot/unity/tests/test_shopping_lens.py (+10/-8)
To merge this branch: bzr merge lp:~sil2100/unity/autopilot_shopping_fix
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133738@code.launchpad.net

Commit message

For the shopping lens tests - 'a' is not a sufficient search string, use something that is more likely to result some results. Also, make it locale independent by using gettext translations for categories.

Description of the change

- Problem:

Tests fail due to "a" search string not returning any shopping results. The tests are also failing on non-EN locale.

- Fix:

Use a string more probable in returning shopping results, e.g. "playstation". We also gettext the category values for different locale.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/unity/tests/test_shopping_lens.py'
--- tests/autopilot/unity/tests/test_shopping_lens.py 2012-09-24 23:42:16 +0000
+++ tests/autopilot/unity/tests/test_shopping_lens.py 2012-11-09 19:05:28 +0000
@@ -12,6 +12,7 @@
12from testtools.matchers import Equals, GreaterThan12from testtools.matchers import Equals, GreaterThan
13from time import sleep13from time import sleep
14import urllib214import urllib2
15import gettext
1516
16from unity.tests import UnityTestCase17from unity.tests import UnityTestCase
1718
@@ -25,6 +26,7 @@
25 urllib2.urlopen("http://www.google.com", timeout=2)26 urllib2.urlopen("http://www.google.com", timeout=2)
26 except urllib2.URLError, e:27 except urllib2.URLError, e:
27 self.skip("Skipping test, no internet connection")28 self.skip("Skipping test, no internet connection")
29 gettext.install("unity-lens-shopping")
2830
29 def tearDown(self):31 def tearDown(self):
30 self.dash.ensure_hidden()32 self.dash.ensure_hidden()
@@ -35,7 +37,7 @@
35 self.dash.ensure_visible()37 self.dash.ensure_visible()
36 lens = self.dash.get_current_lens()38 lens = self.dash.get_current_lens()
3739
38 results_category = lens.get_category_by_name("More suggestions")40 results_category = lens.get_category_by_name(_("More suggestions"))
39 refresh_results_fn = lambda: len(results_category.get_results())41 refresh_results_fn = lambda: len(results_category.get_results())
40 self.assertThat(refresh_results_fn, Eventually(Equals(0)))42 self.assertThat(refresh_results_fn, Eventually(Equals(0)))
4143
@@ -45,7 +47,7 @@
45 lens = self.dash.get_current_lens()47 lens = self.dash.get_current_lens()
4648
47 self.keyboard.type("playstation")49 self.keyboard.type("playstation")
48 results_category = lens.get_category_by_name("More suggestions")50 results_category = lens.get_category_by_name(_("More suggestions"))
4951
50 refresh_results_fn = lambda: len(results_category.get_results())52 refresh_results_fn = lambda: len(results_category.get_results())
51 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))53 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))
@@ -56,7 +58,7 @@
56 lens = self.dash.get_current_lens()58 lens = self.dash.get_current_lens()
5759
58 self.keyboard.type("Text Editor")60 self.keyboard.type("Text Editor")
59 results_category = lens.get_category_by_name("More suggestions")61 results_category = lens.get_category_by_name(_("More suggestions"))
6062
61 refresh_results_fn = lambda: len(results_category.get_results())63 refresh_results_fn = lambda: len(results_category.get_results())
62 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))64 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))
@@ -67,7 +69,7 @@
67 lens = self.dash.get_current_lens()69 lens = self.dash.get_current_lens()
6870
69 self.keyboard.type("megadeth")71 self.keyboard.type("megadeth")
70 results_category = lens.get_category_by_name("More suggestions")72 results_category = lens.get_category_by_name(_("More suggestions"))
7173
72 refresh_results_fn = lambda: len(results_category.get_results())74 refresh_results_fn = lambda: len(results_category.get_results())
73 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))75 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))
@@ -77,8 +79,8 @@
77 self.dash.ensure_visible()79 self.dash.ensure_visible()
78 lens = self.dash.get_current_lens()80 lens = self.dash.get_current_lens()
7981
80 self.keyboard.type("a")82 self.keyboard.type("playstation")
81 results_category = lens.get_category_by_name("More suggestions")83 results_category = lens.get_category_by_name(_("More suggestions"))
8284
83 refresh_results_fn = lambda: len(results_category.get_results())85 refresh_results_fn = lambda: len(results_category.get_results())
84 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))86 self.assertThat(refresh_results_fn, Eventually(GreaterThan(1)))
@@ -95,8 +97,8 @@
95 self.dash.ensure_visible()97 self.dash.ensure_visible()
96 lens = self.dash.get_current_lens()98 lens = self.dash.get_current_lens()
9799
98 self.keyboard.type("a")100 self.keyboard.type("playstation")
99 results_category = lens.get_category_by_name("More suggestions")101 results_category = lens.get_category_by_name(_("More suggestions"))
100102
101 refresh_results_fn = lambda: len(results_category.get_results())103 refresh_results_fn = lambda: len(results_category.get_results())
102 self.assertThat(refresh_results_fn, Eventually(GreaterThan(2)))104 self.assertThat(refresh_results_fn, Eventually(GreaterThan(2)))