Merge lp:~nskaggs/ubuntu-filemanager-app/fix-ap-item-renames into lp:ubuntu-filemanager-app

Proposed by Nicholas Skaggs on 2016-01-14
Status: Merged
Approved by: Nicholas Skaggs on 2016-01-14
Approved revision: 514
Merged at revision: 513
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/fix-ap-item-renames
Merge into: lp:ubuntu-filemanager-app
Diff against target: 30 lines (+3/-3)
1 file modified
tests/autopilot/filemanager/__init__.py (+3/-3)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/fix-ap-item-renames
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-01-14
Ubuntu File Manager Developers 2016-01-14 Pending
Review via email: mp+282628@code.launchpad.net

Commit message

Fix autopilot tests in trunk -- UI element types changed slightly.

Description of the change

Fix autopilot tests in trunk -- UI element types changed slightly.

To post a comment you must log in.
review: Needs Fixing (continuous-integration)

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1439/console

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1440/console

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/filemanager/__init__.py'
2--- tests/autopilot/filemanager/__init__.py 2015-03-12 21:39:41 +0000
3+++ tests/autopilot/filemanager/__init__.py 2016-01-14 16:46:35 +0000
4@@ -108,7 +108,7 @@
5 """Bring the places page to the screen"""
6 try:
7 action_item = self.wait_select_single(
8- 'ShapeItem', objectName='bottomEdgeTip')
9+ 'UCUbuntuShape', objectName='bottomEdgeTip')
10 action_item.visible.wait_for(True)
11 action_item.isAnimating.wait_for(False)
12 start_x = (action_item.globalRect.x +
13@@ -396,7 +396,7 @@
14
15 def _split_header_text(self):
16 header_text = self.select_single(
17- 'Header', objectName='listViewSmallHeader').text
18+ 'ListItemHeader', objectName='listViewSmallHeader').text
19 match = re.match(self.SPLIT_HEADER_REGEX, header_text)
20 if match:
21 path = match.group(1)
22@@ -432,7 +432,7 @@
23
24 def _split_header_text(self):
25 header_text = self.select_single(
26- 'Header', objectName='iconViewHeader').text
27+ 'ListItemHeader', objectName='iconViewHeader').text
28 match = re.match(self.SPLIT_HEADER_REGEX, header_text)
29 if match:
30 path = match.group(1)

Subscribers

People subscribed via source and target branches