Merge lp:~canonical-platform-qa/address-book-app/fix_base_class into lp:address-book-app

Proposed by Leo Arias
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 423
Merged at revision: 426
Proposed branch: lp:~canonical-platform-qa/address-book-app/fix_base_class
Merge into: lp:address-book-app
Diff against target: 36 lines (+4/-4)
1 file modified
tests/autopilot/address_book_app/tests/__init__.py (+4/-4)
To merge this branch: bzr merge lp:~canonical-platform-qa/address-book-app/fix_base_class
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Christopher Lee (community) Approve
Review via email: mp+256243@code.launchpad.net

Commit message

Fix the base class used when launching the app in autopilot tests.

Description of the change

Using the common base class from the toolkit simplifies the inheritance of autopilot custom proxy objects. The tests are the same, but this allows us to make some changes on the autopilot registry.

Are there any related MPs required for this MP to build/function as expected? Please list.

No related MPs.

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

It is.

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

Just running the tests.

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

Just the automated ones. There is an unrelated error in one of the tests.

If you changed the UI, was the change specified/approved by design?

No UI changes.

If you changed UI labels, did you update the pot file?

No label changes.

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

No packaging changes.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

review: Approve
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 :

getting a new execution to see if the network errors in jenkins are solved.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Do we still need the implementation of "AddressBookApp" class? If not we should remove the code from __init__.py file.

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

Yes, it is needed. Autopilot will keep it in the object registry, so every time a QML object matches the validate_dbus method of AddressBookApp, autopilot will instantiate it and return our custom proxy object instead of a generic one.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

ok thanks for the information.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
2--- tests/autopilot/address_book_app/tests/__init__.py 2015-02-19 07:02:09 +0000
3+++ tests/autopilot/address_book_app/tests/__init__.py 2015-04-14 22:19:45 +0000
4@@ -25,7 +25,7 @@
5 from autopilot.platform import model
6 from testtools.matchers import Equals
7
8-import address_book_app
9+import ubuntuuitoolkit
10 from ubuntuuitoolkit import emulators as toolkit_emulators
11
12
13@@ -98,7 +98,7 @@
14 self.app_bin,
15 *AddressBookAppTestCase.ARGS,
16 app_type='qt',
17- emulator_base=address_book_app.AddressBookApp)
18+ emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
19
20 def launch_test_installed(self):
21 df = "/usr/share/applications/address-book-app.desktop"
22@@ -107,12 +107,12 @@
23 "address-book-app",
24 *AddressBookAppTestCase.ARGS,
25 app_type='qt',
26- emulator_base=address_book_app.AddressBookApp)
27+ emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
28
29 def launch_click_installed(self):
30 return self.launch_click_package(
31 'com.ubuntu.address-book',
32- emulator_base=address_book_app.AddressBookApp)
33+ emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
34
35 @property
36 def main_window(self):

Subscribers

People subscribed via source and target branches