Merge lp:~nskaggs/ubuntu-clock-app/fix-ap-mainview into lp:ubuntu-clock-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 381
Merged at revision: 385
Proposed branch: lp:~nskaggs/ubuntu-clock-app/fix-ap-mainview
Merge into: lp:ubuntu-clock-app
Diff against target: 60 lines (+10/-4)
2 files modified
app/ubuntu-clock-app.qml (+1/-1)
tests/autopilot/ubuntu_clock_app/__init__.py (+9/-3)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-clock-app/fix-ap-mainview
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+271029@code.launchpad.net

Commit message

Fix Mainview12 issue

Description of the change

Probably should at least land this change so anyone can work off of it.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM! Thnx for the fix Nicholas!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/317/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-autolanding/74/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml 2015-08-26 23:35:50 +0000
+++ app/ubuntu-clock-app.qml 2015-09-14 20:53:59 +0000
@@ -30,7 +30,7 @@
30 property bool applicationState: Qt.application.active30 property bool applicationState: Qt.application.active
3131
32 // objectName for functional testing purposes (autopilot-qt5)32 // objectName for functional testing purposes (autopilot-qt5)
33 objectName: "clock"33 objectName: "clockMainView"
3434
35 // applicationName for click packages (used as an unique app identifier)35 // applicationName for click packages (used as an unique app identifier)
36 applicationName: "com.ubuntu.clock"36 applicationName: "com.ubuntu.clock"
3737
=== modified file 'tests/autopilot/ubuntu_clock_app/__init__.py'
--- tests/autopilot/ubuntu_clock_app/__init__.py 2015-06-17 21:03:43 +0000
+++ tests/autopilot/ubuntu_clock_app/__init__.py 2015-09-14 20:53:59 +0000
@@ -49,6 +49,11 @@
4949
50class MainView(ubuntuuitoolkit.MainView):50class MainView(ubuntuuitoolkit.MainView):
5151
52 # bug 1341671 means AP sees this as MainView12
53 @classmethod
54 def get_type_query_name(cls):
55 return 'MainView12'
56
52 @autopilot_logging.log_action(logger.info)57 @autopilot_logging.log_action(logger.info)
53 def open_clock(self):58 def open_clock(self):
54 """Open the Clock Page.59 """Open the Clock Page.
@@ -68,7 +73,7 @@
68 clockPage = self.open_clock()73 clockPage = self.open_clock()
69 clockPage.reveal_bottom_edge_page()74 clockPage.reveal_bottom_edge_page()
70 self.get_header().visible.wait_for(True)75 self.get_header().visible.wait_for(True)
71 return self.wait_select_single(Page11)76 return self.wait_select_single(AlarmPage)
7277
73 def get_AlarmList(self):78 def get_AlarmList(self):
74 """ Get the AlarmList object. """79 """ Get the AlarmList object. """
@@ -92,11 +97,12 @@
92 self.main_view = self.get_root_instance().select_single(MainView)97 self.main_view = self.get_root_instance().select_single(MainView)
9398
9499
95class PageWithBottomEdge(MainView):100class PageWithBottomEdge(Page):
96 """101 """
97 An emulator class that makes it easy to interact with the bottom edge102 An emulator class that makes it easy to interact with the bottom edge
98 swipe page103 swipe page
99 """104 """
105
100 def __init__(self, *args):106 def __init__(self, *args):
101 super(PageWithBottomEdge, self).__init__(*args)107 super(PageWithBottomEdge, self).__init__(*args)
102108
@@ -191,7 +197,7 @@
191 self.pointing_device.click_object(deleteButton)197 self.pointing_device.click_object(deleteButton)
192198
193199
194class Page11(Page):200class AlarmPage(Page):
195 """Autopilot helper for the Alarm page."""201 """Autopilot helper for the Alarm page."""
196202
197 @autopilot_logging.log_action(logger.info)203 @autopilot_logging.log_action(logger.info)

Subscribers

People subscribed via source and target branches