Merge lp:~canonical-platform-qa/dialer-app/fix1349582-number_format into lp:dialer-app

Proposed by Leo Arias
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 200
Merged at revision: 202
Proposed branch: lp:~canonical-platform-qa/dialer-app/fix1349582-number_format
Merge into: lp:dialer-app
Diff against target: 69 lines (+23/-10)
1 file modified
tests/autopilot/dialer_app/tests/__init__.py (+23/-10)
To merge this branch: bzr merge lp:~canonical-platform-qa/dialer-app/fix1349582-number_format
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Chris Gagnon (community) Needs Fixing
Review via email: mp+228580@code.launchpad.net

Commit message

Set up the locale for autopilot tests.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Chris Gagnon (chris.gagnon) wrote :

I'd like these tests use the same code formatting standard as the autopilot project (see code comments)

I'd also like to see the tests pass before approving

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
200. By Leo Arias

Follow the autopilot style for closing parentheses.

Revision history for this message
Leo Arias (elopio) wrote :

> I'd like these tests use the same code formatting standard as the autopilot
> project (see code comments)
>
> I'd also like to see the tests pass before approving

Done. And all the tests passing now. Which is a little weird as there's another open bug, I'll take a look there. But anyway, all the tests I touched here are now passing, which is good.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

Ok, these results make more sense. The only remaining failures is fixed here:
https://code.launchpad.net/~canonical-platform-qa/dialer-app/fix1349641-swipe_recent/+merge/228594

Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but the problem is fixed in a separate MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/dialer_app/tests/__init__.py'
--- tests/autopilot/dialer_app/tests/__init__.py 2014-06-19 17:26:34 +0000
+++ tests/autopilot/dialer_app/tests/__init__.py 2014-07-29 23:43:51 +0000
@@ -9,13 +9,17 @@
99
10"""Dialer App autopilot tests."""10"""Dialer App autopilot tests."""
1111
12import fixtures
12from autopilot.input import Mouse, Touch, Pointer13from autopilot.input import Mouse, Touch, Pointer
13from autopilot.introspection import get_proxy_object_for_existing_process14from autopilot.introspection import get_proxy_object_for_existing_process
14from autopilot.matchers import Eventually15from autopilot.matchers import Eventually
15from autopilot.platform import model16from autopilot.platform import model
16from autopilot.testcase import AutopilotTestCase17from autopilot.testcase import AutopilotTestCase
17from testtools.matchers import Equals18from testtools.matchers import Equals
18from ubuntuuitoolkit import emulators as toolkit_emulators19from ubuntuuitoolkit import (
20 emulators as toolkit_emulators,
21 fixture_setup
22)
19from dialer_app import emulators23from dialer_app import emulators
20from dialer_app import helpers24from dialer_app import helpers
2125
@@ -53,6 +57,8 @@
53 self.pointing_device = Pointer(self.input_device_class.create())57 self.pointing_device = Pointer(self.input_device_class.create())
54 super(DialerAppTestCase, self).setUp()58 super(DialerAppTestCase, self).setUp()
5559
60 self.set_up_locale()
61
56 if os.path.exists(self.local_location):62 if os.path.exists(self.local_location):
57 self.launch_test_local()63 self.launch_test_local()
58 else:64 else:
@@ -60,21 +66,28 @@
6066
61 self.assertThat(self.main_view.visible, Eventually(Equals(True)))67 self.assertThat(self.main_view.visible, Eventually(Equals(True)))
6268
69 def set_up_locale(self):
70 # We set up the language to english to check the formatting of the
71 # dialed number.
72 self.useFixture(
73 fixtures.EnvironmentVariable('LANGUAGE', newvalue='en')
74 )
75 self.useFixture(
76 fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')
77 )
78
63 def launch_test_local(self):79 def launch_test_local(self):
64 self.app = self.launch_test_application(80 self.app = self.launch_test_application(
65 self.local_location,81 self.local_location,
66 app_type='qt',82 app_type='qt',
67 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)83 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
84 )
6885
69 def launch_test_installed(self):86 def launch_test_installed(self):
70 if model() == 'Desktop':87 self.app = self.launch_upstart_application(
71 self.app = self.launch_test_application(88 'dialer-app',
72 "dialer-app",89 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
73 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)90 )
74 else:
75 self.app = self.launch_upstart_application(
76 "dialer-app",
77 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
7891
79 def _get_app_proxy_object(self, app_name):92 def _get_app_proxy_object(self, app_name):
80 return get_proxy_object_for_existing_process(93 return get_proxy_object_for_existing_process(

Subscribers

People subscribed via source and target branches