Unity 8

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

  1. fixLightdmMockWarnings
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 2705
Merged at revision: 2736
Proposed branch: lp:~aacid/unity8/fixLightdmMockWarnings
Merge into: lp:unity8
Diff against target: 97 lines (+24/-24)
2 files modified
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp (+1/-1)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+23/-23)
To merge this branch: bzr merge lp:~aacid/unity8/fixLightdmMockWarnings
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Daniel d'Andrada (community) Approve
Review via email: mp+311914@code.launchpad.net

Commit message

Fix compile warnings in mocks

Description of the change

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
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.
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Warnings are gone.

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

* Did CI run pass? If not, please explain why.
Not relevant to this MP

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2705
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2580/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3395
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3423
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3274/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2580/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp 2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp 2016-11-28 10:21:11 +0000
@@ -22,6 +22,7 @@
2222
23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
24 : testScenario("singleSession")24 : testScenario("singleSession")
25 , q_ptr(parent)
25 , m_availableSessions(26 , m_availableSessions(
26 {27 {
27 {"ubuntu", "", "Ubuntu", ""},28 {"ubuntu", "", "Ubuntu", ""},
@@ -36,7 +37,6 @@
36 {"xterm", "", "Recovery Console", ""},37 {"xterm", "", "Recovery Console", ""},
37 {"", "", "Unknown?", ""}38 {"", "", "Unknown?", ""}
38 })39 })
39 , q_ptr(parent)
40{40{
41 numSessions = numAvailableSessions();41 numSessions = numAvailableSessions();
42 resetEntries();42 resetEntries();
4343
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-08-30 13:46:17 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-11-28 10:21:11 +0000
@@ -73,7 +73,7 @@
73{73{
74 entries =74 entries =
75 {75 {
76 { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },76 { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
77 };77 };
78}78}
7979
@@ -81,7 +81,7 @@
81{81{
82 entries =82 entries =
83 {83 {
84 { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },84 { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
85 };85 };
86}86}
8787
@@ -89,7 +89,7 @@
89{89{
90 entries =90 entries =
91 {91 {
92 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },92 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
93 };93 };
94}94}
9595
@@ -97,27 +97,27 @@
97{97{
98 entries =98 entries =
99 {99 {
100 { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },100 { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0, 0 },
101 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },101 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
102 { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },102 { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
103 { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },103 { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0, 0 },
104 { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },104 { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0, 0 },
105 { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },105 { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0, 0 },
106 { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },106 { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
107 { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },107 { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
108 { "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },108 { "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
109 { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },109 { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
110 { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },110 { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
111 { "long-name", "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },111 { "long-name", "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0, 0 },
112 { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },112 { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0, 0 },
113 // white and black are a bit redundant, but useful for manually testing if UI is still readable113 // white and black are a bit redundant, but useful for manually testing if UI is still readable
114 { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },114 { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0, 0 },
115 { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },115 { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0, 0 },
116 { "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },116 { "no-background", "No Background", "", 0, false, false, "ubuntu", 0, 0 },
117 { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },117 { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0, 0 },
118 { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },118 { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0, 0 },
119 { "empty-name", "", 0, 0, false, false, "ubuntu", 0 },119 { "empty-name", "", 0, 0, false, false, "ubuntu", 0, 0 },
120 { "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },120 { "active", "Active Account", 0, 0, true, false, "ubuntu", 0, 0 },
121 };121 };
122}122}
123123

Subscribers

People subscribed via source and target branches