Unity 8

Merge lp:~aacid/unity8/fixQmlTestsNewSDK into lp:unity8

  1. fixQmlTestsNewSDK
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-12-11
Status: Merged
Approved by: Michał Sawicz on 2015-12-14
Approved revision: 2081
Merged at revision: 2119
Proposed branch: lp:~aacid/unity8/fixQmlTestsNewSDK
Merge into: lp:unity8
Diff against target: 59 lines (+5/-5)
4 files modified
tests/autopilot/unity8/dash.py (+1/-1)
tests/qmltests/Dash/tst_Dash.qml (+1/-1)
tests/qmltests/Dash/tst_DashContent.qml (+1/-1)
tests/qmltests/Dash/tst_GenericScopeView.qml (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity8/fixQmlTestsNewSDK
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) 2015-12-11 Approve on 2015-12-11
PS Jenkins bot continuous-integration Needs Fixing on 2015-12-11
Review via email: mp+280260@code.launchpad.net

Commit Message

SDK changed the name they give to the buttons, follow

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
New SDK

 * Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2081
http://jenkins.qa.ubuntu.com/job/unity8-ci/6921/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5726
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/336/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1632
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25975
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/335/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6921/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2081
http://jenkins.qa.ubuntu.com/job/unity8-ci/6922/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5728
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/337/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1633
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5741
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25979
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/336/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6922/rebuild

review: Needs Fixing (continuous-integration)
Lukáš Tinkl (lukas-kde) wrote :

LGTM, works and Jenkins agrees too :)

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes, except xenial

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve
lp:~aacid/unity8/fixQmlTestsNewSDK updated on 2015-12-16
2082. By Albert Astals Cid on 2015-12-16

Merge

2083. By Albert Astals Cid on 2015-12-16

Another action_button -> button fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity8/dash.py'
2--- tests/autopilot/unity8/dash.py 2015-09-18 07:41:52 +0000
3+++ tests/autopilot/unity8/dash.py 2015-12-16 14:36:02 +0000
4@@ -158,7 +158,7 @@
5 def enter_search_query(self, query, keyboard):
6 current_header = self._get_current_page_header()
7 search_button = \
8- current_header.select_single(objectName="search_action_button")
9+ current_header.select_single(objectName="search_button")
10 self.pointing_device.move(
11 search_button.globalRect.x + search_button.width / 2,
12 search_button.globalRect.y + search_button.height / 2)
13
14=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
15--- tests/qmltests/Dash/tst_Dash.qml 2015-09-02 07:42:27 +0000
16+++ tests/qmltests/Dash/tst_Dash.qml 2015-12-16 14:36:02 +0000
17@@ -319,7 +319,7 @@
18
19 // Click on the store
20 var scopesListPageHeader = findChild(scopesList, "pageHeader");
21- var searchButton = findChild(scopesListPageHeader, "store_action_button");
22+ var searchButton = findChild(scopesListPageHeader, "store_button");
23 mouseClick(searchButton);
24
25 spy.wait();
26
27=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
28--- tests/qmltests/Dash/tst_DashContent.qml 2015-11-24 09:18:42 +0000
29+++ tests/qmltests/Dash/tst_DashContent.qml 2015-12-16 14:36:02 +0000
30@@ -604,7 +604,7 @@
31 {
32 var dashContentList = findChild(dashContent, "dashContentList");
33 var header = findChild(dashContentList.currentItem, "scopePageHeader")
34- var favoriteAction = findChild(header, "favorite_action_button");
35+ var favoriteAction = findChild(header, "favorite_button");
36 compare(dashContentList.currentIndex, 0);
37 compare(dashContentList.indexAt(dashContentList.width * 1.5, 0), 1);
38 var nextScopeId = dashContentList.itemAt(dashContentList.width * 1.5, 0).item.scope.id;
39
40=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
41--- tests/qmltests/Dash/tst_GenericScopeView.qml 2015-11-11 09:18:45 +0000
42+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2015-12-16 14:36:02 +0000
43@@ -434,7 +434,7 @@
44 // open
45 tryCompare(testCase.subPageLoader, "open", false);
46 tryCompare(testCase.subPageLoader, "visible", false);
47- var settings = findChild(innerHeader, "settings_action_button");
48+ var settings = findChild(innerHeader, "settings_button");
49 mouseClick(settings);
50 tryCompare(testCase.subPageLoader, "open", true);
51 tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
52@@ -582,7 +582,7 @@
53 verify(innerHeader, "Could not find the inner header");
54
55 expectFail("Apps", "Click scope should not have a favorite button");
56- var favoriteAction = findChild(innerHeader, "favorite_action_button");
57+ var favoriteAction = findChild(innerHeader, "favorite_button");
58 verify(favoriteAction, "Could not find the favorite action.");
59 mouseClick(favoriteAction);
60

Subscribers

People subscribed via source and target branches