Merge lp:~dandrader/unity8/fixOrientedShellTests into lp:unity8
- fixOrientedShellTests
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Josh Arenson |
Approved revision: | 1833 |
Merged at revision: | 1833 |
Proposed branch: | lp:~dandrader/unity8/fixOrientedShellTests |
Merge into: | lp:unity8 |
Diff against target: |
329 lines (+31/-49) 10 files modified
qml/OrientedShell.qml (+1/-0) qml/Shell.qml (+13/-15) src/ApplicationArguments.h (+5/-0) src/main.cpp (+2/-1) tests/autopilot/unity8/greeter/tests/test_args.py (+6/-6) tests/qmltests/Stages/tst_SurfaceContainer.qml (+0/-1) tests/qmltests/Tutorial/tst_Tutorial.qml (+3/-10) tests/qmltests/tst_OrientedShell.qml (+1/-12) tests/qmltests/tst_Shell.qml (+0/-2) tests/qmltests/tst_ShellWithPin.qml (+0/-2) |
To merge this branch: | bzr merge lp:~dandrader/unity8/fixOrientedShellTests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lukáš Tinkl (community) | Approve | ||
Josh Arenson | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Albert Astals Cid (community) | Abstain | ||
Review via email: mp+262490@code.launchpad.net |
Commit message
Fix tst_OrientedShell and tst_Tutorial
+ Clear several warnings in Shell.qml
+ Move shellMode into applicationArgu
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* 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?
Not applicable
* If you changed the UI, has there been a design review?
Not applicable
* Did you have a look at the warnings when running tests? Can they be reduced?
Yes, solved some of them.
PS Jenkins bot (ps-jenkins) wrote : | # |
- 1830. By CI Train Bot Account
-
Resync trunk.
- 1831. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
Albert Astals Cid (aacid) wrote : | # |
Text conflict in tests/qmltests/
1 conflicts encountered.
- 1832. By Daniel d'Andrada
-
Fix tst_OrientedShell
+ Clear several warnings in Shell.qml
+ Move shellMode into applicationArguments context property
Daniel d'Andrada (dandrader) wrote : | # |
> Text conflict in tests/qmltests/
> 1 conflicts encountered.
Fixed.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1832
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 1833. By Daniel d'Andrada
-
Fix tst_Tutorial.qml
Albert Astals Cid (aacid) wrote : | # |
I do sincerely think the fix for tutorial test is worse than the one in http://
Albert Astals Cid (aacid) : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1833
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1833
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Josh Arenson (josharenson) wrote : | # |
Comments inline.
Daniel d'Andrada (dandrader) wrote : | # |
On 23/06/15 20:44, Josh Arenson wrote:
>> @@ -434,7 +432,7 @@
>> > Greeter {
>> >
>> > hides: [launcher, panel.indicators]
>> > - tabletMode: shell.sideStage
>> > + tabletMode: shell.usageScenario != "phone"
> Do you think naming this property 'phoneMode' would make things more clear? The only place 'tabletMode' is being used is in the greeter, so the amount of refactoring is small. I think the way it is currently is confusing.
>
I think it amounts to the same. Don't see it being any better.
- 1834. By Daniel d'Andrada
-
Also fix tst_SurfaceCont
ainer
Lukáš Tinkl (lukas-kde) wrote : | # |
One minor inline nitpick from me :)
Daniel d'Andrada (dandrader) : | # |
Lukáš Tinkl (lukas-kde) wrote : | # |
See http://
Lukáš Tinkl (lukas-kde) wrote : | # |
Also, https:/
Daniel d'Andrada (dandrader) wrote : | # |
> See http://
> instead-of-by-value for the more elaborate overview of passing by value vs.
> passing by const ref
QString does have a move contructor:
http://
What problem do you see in this case?
Daniel d'Andrada (dandrader) wrote : | # |
> Also,
> https:/
> #Passing_
This applies if you're not using C++11, where you don't have move constructors and move semantics.
Lukáš Tinkl (lukas-kde) wrote : | # |
Ok, I stand corrected then, I didn't know Qt enables it for QStrings under C++11 :)
Preview Diff
1 | === modified file 'qml/OrientedShell.qml' | |||
2 | --- qml/OrientedShell.qml 2015-06-12 16:07:43 +0000 | |||
3 | +++ qml/OrientedShell.qml 2015-06-25 19:25:08 +0000 | |||
4 | @@ -135,6 +135,7 @@ | |||
5 | 135 | nativeOrientation: root.nativeOrientation | 135 | nativeOrientation: root.nativeOrientation |
6 | 136 | nativeWidth: root.width | 136 | nativeWidth: root.width |
7 | 137 | nativeHeight: root.height | 137 | nativeHeight: root.height |
8 | 138 | mode: applicationArguments.mode | ||
9 | 138 | 139 | ||
10 | 139 | // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen), | 140 | // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen), |
11 | 140 | // what's the output device (eg: big TV, desktop monitor, phone display), etc. | 141 | // what's the output device (eg: big TV, desktop monitor, phone display), etc. |
12 | 141 | 142 | ||
13 | === modified file 'qml/Shell.qml' | |||
14 | --- qml/Shell.qml 2015-06-15 22:40:10 +0000 | |||
15 | +++ qml/Shell.qml 2015-06-25 19:25:08 +0000 | |||
16 | @@ -55,6 +55,7 @@ | |||
17 | 55 | property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress | 55 | property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress |
18 | 56 | property bool beingResized | 56 | property bool beingResized |
19 | 57 | property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop" | 57 | property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop" |
20 | 58 | property string mode: "full-greeter" | ||
21 | 58 | function updateFocusedAppOrientation() { | 59 | function updateFocusedAppOrientation() { |
22 | 59 | applicationsDisplayLoader.item.updateFocusedAppOrientation(); | 60 | applicationsDisplayLoader.item.updateFocusedAppOrientation(); |
23 | 60 | } | 61 | } |
24 | @@ -68,9 +69,9 @@ | |||
25 | 68 | 69 | ||
26 | 69 | readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed | 70 | readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed |
27 | 70 | && (applicationsDisplayLoader.item && applicationsDisplayLoader.item.orientationChangesEnabled) | 71 | && (applicationsDisplayLoader.item && applicationsDisplayLoader.item.orientationChangesEnabled) |
29 | 71 | && !greeter.animating | 72 | && (!greeter || !greeter.animating) |
30 | 72 | 73 | ||
32 | 73 | readonly property bool showingGreeter: greeter.shown | 74 | readonly property bool showingGreeter: greeter && greeter.shown |
33 | 74 | 75 | ||
34 | 75 | property bool startingUp: true | 76 | property bool startingUp: true |
35 | 76 | Timer { id: finishStartUpTimer; interval: 500; onTriggered: startingUp = false } | 77 | Timer { id: finishStartUpTimer; interval: 500; onTriggered: startingUp = false } |
36 | @@ -79,7 +80,7 @@ | |||
37 | 79 | if (startingUp) { | 80 | if (startingUp) { |
38 | 80 | // Ensure we don't rotate during start up | 81 | // Ensure we don't rotate during start up |
39 | 81 | return Qt.PrimaryOrientation; | 82 | return Qt.PrimaryOrientation; |
41 | 82 | } else if (greeter.shown) { | 83 | } else if (greeter && greeter.shown) { |
42 | 83 | return Qt.PrimaryOrientation; | 84 | return Qt.PrimaryOrientation; |
43 | 84 | } else if (mainApp) { | 85 | } else if (mainApp) { |
44 | 85 | return mainApp.supportedOrientations; | 86 | return mainApp.supportedOrientations; |
45 | @@ -101,16 +102,13 @@ | |||
46 | 101 | 102 | ||
47 | 102 | // Disable everything while greeter is waiting, so that the user can't swipe | 103 | // Disable everything while greeter is waiting, so that the user can't swipe |
48 | 103 | // the greeter or launcher until we know whether the session is locked. | 104 | // the greeter or launcher until we know whether the session is locked. |
50 | 104 | enabled: !greeter.waiting | 105 | enabled: greeter && !greeter.waiting |
51 | 105 | 106 | ||
52 | 106 | property real edgeSize: units.gu(2) | 107 | property real edgeSize: units.gu(2) |
53 | 107 | property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg") | 108 | property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg") |
54 | 108 | property url background: asImageTester.status == Image.Ready ? asImageTester.source | 109 | property url background: asImageTester.status == Image.Ready ? asImageTester.source |
55 | 109 | : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground | 110 | : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground |
56 | 110 | 111 | ||
57 | 111 | // This is _only_ used to expose the property to autopilot tests | ||
58 | 112 | readonly property string testShellMode: shellMode | ||
59 | 113 | |||
60 | 114 | readonly property alias greeter: greeterLoader.item | 112 | readonly property alias greeter: greeterLoader.item |
61 | 115 | 113 | ||
62 | 116 | function activateApplication(appId) { | 114 | function activateApplication(appId) { |
63 | @@ -264,7 +262,7 @@ | |||
64 | 264 | ? "phone" | 262 | ? "phone" |
65 | 265 | : shell.usageScenario | 263 | : shell.usageScenario |
66 | 266 | source: { | 264 | source: { |
68 | 267 | if(shellMode === "greeter") { | 265 | if(shell.mode === "greeter") { |
69 | 268 | return "Stages/ShimStage.qml" | 266 | return "Stages/ShimStage.qml" |
70 | 269 | } else if (applicationsDisplayLoader.usageScenario === "phone") { | 267 | } else if (applicationsDisplayLoader.usageScenario === "phone") { |
71 | 270 | return "Stages/PhoneStage.qml"; | 268 | return "Stages/PhoneStage.qml"; |
72 | @@ -276,7 +274,7 @@ | |||
73 | 276 | } | 274 | } |
74 | 277 | 275 | ||
75 | 278 | property bool interactive: tutorial.spreadEnabled | 276 | property bool interactive: tutorial.spreadEnabled |
77 | 279 | && !greeter.shown | 277 | && (!greeter || !greeter.shown) |
78 | 280 | && panel.indicators.fullyClosed | 278 | && panel.indicators.fullyClosed |
79 | 281 | && launcher.progress == 0 | 279 | && launcher.progress == 0 |
80 | 282 | && !notifications.useModal | 280 | && !notifications.useModal |
81 | @@ -307,12 +305,12 @@ | |||
82 | 307 | Binding { | 305 | Binding { |
83 | 308 | target: applicationsDisplayLoader.item | 306 | target: applicationsDisplayLoader.item |
84 | 309 | property: "spreadEnabled" | 307 | property: "spreadEnabled" |
86 | 310 | value: tutorial.spreadEnabled && !greeter.hasLockedApp | 308 | value: tutorial.spreadEnabled && (!greeter || !greeter.hasLockedApp) |
87 | 311 | } | 309 | } |
88 | 312 | Binding { | 310 | Binding { |
89 | 313 | target: applicationsDisplayLoader.item | 311 | target: applicationsDisplayLoader.item |
90 | 314 | property: "inverseProgress" | 312 | property: "inverseProgress" |
92 | 315 | value: greeter.locked ? 0 : launcher.progress | 313 | value: greeter && greeter.locked ? 0 : launcher.progress |
93 | 316 | } | 314 | } |
94 | 317 | Binding { | 315 | Binding { |
95 | 318 | target: applicationsDisplayLoader.item | 316 | target: applicationsDisplayLoader.item |
96 | @@ -422,7 +420,7 @@ | |||
97 | 422 | id: greeterLoader | 420 | id: greeterLoader |
98 | 423 | anchors.fill: parent | 421 | anchors.fill: parent |
99 | 424 | anchors.topMargin: panel.panelHeight | 422 | anchors.topMargin: panel.panelHeight |
101 | 425 | sourceComponent: shellMode != "shell" ? integratedGreeter : | 423 | sourceComponent: shell.mode != "shell" ? integratedGreeter : |
102 | 426 | Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml")); | 424 | Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml")); |
103 | 427 | onLoaded: { | 425 | onLoaded: { |
104 | 428 | item.objectName = "greeter" | 426 | item.objectName = "greeter" |
105 | @@ -434,7 +432,7 @@ | |||
106 | 434 | Greeter { | 432 | Greeter { |
107 | 435 | 433 | ||
108 | 436 | hides: [launcher, panel.indicators] | 434 | hides: [launcher, panel.indicators] |
110 | 437 | tabletMode: shell.sideStageEnabled | 435 | tabletMode: shell.usageScenario != "phone" |
111 | 438 | launcherOffset: launcher.progress | 436 | launcherOffset: launcher.progress |
112 | 439 | forcedUnlock: tutorial.running | 437 | forcedUnlock: tutorial.running |
113 | 440 | background: shell.background | 438 | background: shell.background |
114 | @@ -550,8 +548,8 @@ | |||
115 | 550 | indicators { | 548 | indicators { |
116 | 551 | hides: [launcher] | 549 | hides: [launcher] |
117 | 552 | available: tutorial.panelEnabled | 550 | available: tutorial.panelEnabled |
120 | 553 | && (!greeter.locked || AccountsService.enableIndicatorsWhileLocked) | 551 | && ((!greeter || !greeter.locked) || AccountsService.enableIndicatorsWhileLocked) |
121 | 554 | && !greeter.hasLockedApp | 552 | && (!greeter || !greeter.hasLockedApp) |
122 | 555 | contentEnabled: tutorial.panelContentEnabled | 553 | contentEnabled: tutorial.panelContentEnabled |
123 | 556 | width: parent.width > units.gu(60) ? units.gu(40) : parent.width | 554 | width: parent.width > units.gu(60) ? units.gu(40) : parent.width |
124 | 557 | 555 | ||
125 | 558 | 556 | ||
126 | === modified file 'src/ApplicationArguments.h' | |||
127 | --- src/ApplicationArguments.h 2015-06-12 16:07:43 +0000 | |||
128 | +++ src/ApplicationArguments.h 2015-06-25 19:25:08 +0000 | |||
129 | @@ -27,14 +27,19 @@ | |||
130 | 27 | { | 27 | { |
131 | 28 | Q_OBJECT | 28 | Q_OBJECT |
132 | 29 | Q_PROPERTY(QString deviceName READ deviceName CONSTANT) | 29 | Q_PROPERTY(QString deviceName READ deviceName CONSTANT) |
133 | 30 | Q_PROPERTY(QString mode READ mode CONSTANT) | ||
134 | 30 | public: | 31 | public: |
135 | 31 | ApplicationArguments(QObject *parent = nullptr); | 32 | ApplicationArguments(QObject *parent = nullptr); |
136 | 32 | 33 | ||
137 | 33 | void setDeviceName(QString deviceName) { m_deviceName = deviceName; } | 34 | void setDeviceName(QString deviceName) { m_deviceName = deviceName; } |
138 | 34 | QString deviceName() const { return m_deviceName; } | 35 | QString deviceName() const { return m_deviceName; } |
139 | 35 | 36 | ||
140 | 37 | void setMode(QString mode) { m_mode = mode; } | ||
141 | 38 | QString mode() const { return m_mode; } | ||
142 | 39 | |||
143 | 36 | private: | 40 | private: |
144 | 37 | QString m_deviceName; | 41 | QString m_deviceName; |
145 | 42 | QString m_mode; | ||
146 | 38 | }; | 43 | }; |
147 | 39 | 44 | ||
148 | 40 | #endif // APPLICATION_ARGUMENTS_H | 45 | #endif // APPLICATION_ARGUMENTS_H |
149 | 41 | 46 | ||
150 | === modified file 'src/main.cpp' | |||
151 | --- src/main.cpp 2015-06-12 16:07:43 +0000 | |||
152 | +++ src/main.cpp 2015-06-25 19:25:08 +0000 | |||
153 | @@ -60,6 +60,8 @@ | |||
154 | 60 | qmlArgs.setDeviceName(QString(buffer)); | 60 | qmlArgs.setDeviceName(QString(buffer)); |
155 | 61 | } | 61 | } |
156 | 62 | 62 | ||
157 | 63 | qmlArgs.setMode(parser.mode()); | ||
158 | 64 | |||
159 | 63 | // The testability driver is only loaded by QApplication but not by QGuiApplication. | 65 | // The testability driver is only loaded by QApplication but not by QGuiApplication. |
160 | 64 | // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own. | 66 | // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own. |
161 | 65 | if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) { | 67 | if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) { |
162 | @@ -92,7 +94,6 @@ | |||
163 | 92 | 94 | ||
164 | 93 | view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory())); | 95 | view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory())); |
165 | 94 | view->rootContext()->setContextProperty("applicationArguments", &qmlArgs); | 96 | view->rootContext()->setContextProperty("applicationArguments", &qmlArgs); |
166 | 95 | view->rootContext()->setContextProperty("shellMode", parser.mode()); | ||
167 | 96 | if (parser.hasFrameless()) { | 97 | if (parser.hasFrameless()) { |
168 | 97 | view->setFlags(Qt::FramelessWindowHint); | 98 | view->setFlags(Qt::FramelessWindowHint); |
169 | 98 | } | 99 | } |
170 | 99 | 100 | ||
171 | === modified file 'tests/autopilot/unity8/greeter/tests/test_args.py' | |||
172 | --- tests/autopilot/unity8/greeter/tests/test_args.py 2015-04-16 14:48:50 +0000 | |||
173 | +++ tests/autopilot/unity8/greeter/tests/test_args.py 2015-06-25 19:25:08 +0000 | |||
174 | @@ -28,27 +28,27 @@ | |||
175 | 28 | def test_full_greeter_mode(self): | 28 | def test_full_greeter_mode(self): |
176 | 29 | unity_proxy = self.launch_unity(mode='full-greeter') | 29 | unity_proxy = self.launch_unity(mode='full-greeter') |
177 | 30 | shell = self.get_shell(unity_proxy) | 30 | shell = self.get_shell(unity_proxy) |
179 | 31 | self.assertTrue(shell.testShellMode == 'full-greeter') | 31 | self.assertTrue(shell.mode == 'full-greeter') |
180 | 32 | 32 | ||
181 | 33 | def test_full_shell_mode(self): | 33 | def test_full_shell_mode(self): |
182 | 34 | unity_proxy = self.launch_unity(mode='full-shell') | 34 | unity_proxy = self.launch_unity(mode='full-shell') |
183 | 35 | shell = self.get_shell(unity_proxy) | 35 | shell = self.get_shell(unity_proxy) |
185 | 36 | self.assertTrue(shell.testShellMode == 'full-shell') | 36 | self.assertTrue(shell.mode == 'full-shell') |
186 | 37 | 37 | ||
187 | 38 | def test_greeter_mode(self): | 38 | def test_greeter_mode(self): |
188 | 39 | unity_proxy = self.launch_unity(mode='greeter') | 39 | unity_proxy = self.launch_unity(mode='greeter') |
189 | 40 | shell = self.get_shell(unity_proxy) | 40 | shell = self.get_shell(unity_proxy) |
191 | 41 | self.assertTrue(shell.testShellMode == 'greeter') | 41 | self.assertTrue(shell.mode == 'greeter') |
192 | 42 | 42 | ||
193 | 43 | def test_nonexistent_mode(self): | 43 | def test_nonexistent_mode(self): |
194 | 44 | unity_proxy = self.launch_unity(mode=self.NONEXISTENT_MODE) | 44 | unity_proxy = self.launch_unity(mode=self.NONEXISTENT_MODE) |
195 | 45 | shell = self.get_shell(unity_proxy) | 45 | shell = self.get_shell(unity_proxy) |
197 | 46 | self.assertTrue(shell.testShellMode == self.DEFAULT_SHELL_MODE, | 46 | self.assertTrue(shell.mode == self.DEFAULT_SHELL_MODE, |
198 | 47 | "Shell mode was {} but should have been {}" | 47 | "Shell mode was {} but should have been {}" |
200 | 48 | .format(shell.testShellMode, | 48 | .format(shell.mode, |
201 | 49 | self.DEFAULT_SHELL_MODE)) | 49 | self.DEFAULT_SHELL_MODE)) |
202 | 50 | 50 | ||
203 | 51 | def test_shell_mode(self): | 51 | def test_shell_mode(self): |
204 | 52 | unity_proxy = self.launch_unity(mode='shell') | 52 | unity_proxy = self.launch_unity(mode='shell') |
205 | 53 | shell = self.get_shell(unity_proxy) | 53 | shell = self.get_shell(unity_proxy) |
207 | 54 | self.assertTrue(shell.testShellMode == 'shell') | 54 | self.assertTrue(shell.mode == 'shell') |
208 | 55 | 55 | ||
209 | === modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml' | |||
210 | --- tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-03-12 14:45:44 +0000 | |||
211 | +++ tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-06-25 19:25:08 +0000 | |||
212 | @@ -32,7 +32,6 @@ | |||
213 | 32 | id: surfaceContainerComponent | 32 | id: surfaceContainerComponent |
214 | 33 | SurfaceContainer { | 33 | SurfaceContainer { |
215 | 34 | anchors.fill: parent | 34 | anchors.fill: parent |
216 | 35 | orientation: Qt.PortraitOrientation | ||
217 | 36 | interactive: interactiveCheckbox.checked | 35 | interactive: interactiveCheckbox.checked |
218 | 37 | } | 36 | } |
219 | 38 | } | 37 | } |
220 | 39 | 38 | ||
221 | === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml' | |||
222 | --- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-06-15 22:40:10 +0000 | |||
223 | +++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-06-25 19:25:08 +0000 | |||
224 | @@ -17,7 +17,6 @@ | |||
225 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.0 |
226 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
227 | 19 | import AccountsService 0.1 | 19 | import AccountsService 0.1 |
228 | 20 | import GSettings 1.0 | ||
229 | 21 | import LightDM 0.1 as LightDM | 20 | import LightDM 0.1 as LightDM |
230 | 22 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.1 |
231 | 23 | import Unity.Application 0.1 | 22 | import Unity.Application 0.1 |
232 | @@ -46,11 +45,6 @@ | |||
233 | 46 | } | 45 | } |
234 | 47 | } | 46 | } |
235 | 48 | 47 | ||
236 | 49 | GSettings { | ||
237 | 50 | id: unity8Settings | ||
238 | 51 | schema.id: "com.canonical.Unity8" | ||
239 | 52 | } | ||
240 | 53 | |||
241 | 54 | Component.onCompleted: { | 48 | Component.onCompleted: { |
242 | 55 | // must set the mock mode before loading the Shell | 49 | // must set the mock mode before loading the Shell |
243 | 56 | LightDM.Greeter.mockMode = "single-pin"; | 50 | LightDM.Greeter.mockMode = "single-pin"; |
244 | @@ -73,7 +67,6 @@ | |||
245 | 73 | sourceComponent: Component { | 67 | sourceComponent: Component { |
246 | 74 | Shell { | 68 | Shell { |
247 | 75 | property string indicatorProfile: "phone" | 69 | property string indicatorProfile: "phone" |
248 | 76 | property string shellMode: "full-greeter" /* default */ | ||
249 | 77 | 70 | ||
250 | 78 | Component.onDestruction: { | 71 | Component.onDestruction: { |
251 | 79 | shellLoader.itemDestroyed = true; | 72 | shellLoader.itemDestroyed = true; |
252 | @@ -119,7 +112,7 @@ | |||
253 | 119 | 112 | ||
254 | 120 | function init() { | 113 | function init() { |
255 | 121 | tryCompare(shell, "enabled", true); // enabled by greeter when ready | 114 | tryCompare(shell, "enabled", true); // enabled by greeter when ready |
257 | 122 | unity8Settings.usageMode = "Staged"; | 115 | |
258 | 123 | AccountsService.demoEdges = false; | 116 | AccountsService.demoEdges = false; |
259 | 124 | AccountsService.demoEdges = true; | 117 | AccountsService.demoEdges = true; |
260 | 125 | swipeAwayGreeter(); | 118 | swipeAwayGreeter(); |
261 | @@ -193,7 +186,7 @@ | |||
262 | 193 | } | 186 | } |
263 | 194 | 187 | ||
264 | 195 | function checkRightEdge() { | 188 | function checkRightEdge() { |
266 | 196 | if (unity8Settings.usageMode === "Staged") { | 189 | if (shell.usageScenario === "phone") { |
267 | 197 | touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight); | 190 | touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight); |
268 | 198 | 191 | ||
269 | 199 | var stage = findChild(shell, "stage"); | 192 | var stage = findChild(shell, "stage"); |
270 | @@ -271,7 +264,7 @@ | |||
271 | 271 | } | 264 | } |
272 | 272 | 265 | ||
273 | 273 | function test_walkthroughOnDesktop() { | 266 | function test_walkthroughOnDesktop() { |
275 | 274 | unity8Settings.usageMode = "Windowed"; | 267 | shell.usageScenario = "desktop"; |
276 | 275 | var page = goToPage("tutorialLeftFinish"); | 268 | var page = goToPage("tutorialLeftFinish"); |
277 | 276 | var tick = findChild(page, "tick"); | 269 | var tick = findChild(page, "tick"); |
278 | 277 | tap(tick); | 270 | tap(tick); |
279 | 278 | 271 | ||
280 | === modified file 'tests/qmltests/tst_OrientedShell.qml' | |||
281 | --- tests/qmltests/tst_OrientedShell.qml 2015-05-11 14:36:03 +0000 | |||
282 | +++ tests/qmltests/tst_OrientedShell.qml 2015-06-25 19:25:08 +0000 | |||
283 | @@ -34,19 +34,8 @@ | |||
284 | 34 | 34 | ||
285 | 35 | QtObject { | 35 | QtObject { |
286 | 36 | id: applicationArguments | 36 | id: applicationArguments |
287 | 37 | |||
288 | 38 | function hasGeometry() { | ||
289 | 39 | return false; | ||
290 | 40 | } | ||
291 | 41 | |||
292 | 42 | function width() { | ||
293 | 43 | return 0; | ||
294 | 44 | } | ||
295 | 45 | |||
296 | 46 | function height() { | ||
297 | 47 | return 0; | ||
298 | 48 | } | ||
299 | 49 | property string deviceName: "mako" | 37 | property string deviceName: "mako" |
300 | 38 | property string mode: "full-greeter" | ||
301 | 50 | } | 39 | } |
302 | 51 | 40 | ||
303 | 52 | QtObject { | 41 | QtObject { |
304 | 53 | 42 | ||
305 | === modified file 'tests/qmltests/tst_Shell.qml' | |||
306 | --- tests/qmltests/tst_Shell.qml 2015-06-18 18:17:09 +0000 | |||
307 | +++ tests/qmltests/tst_Shell.qml 2015-06-25 19:25:08 +0000 | |||
308 | @@ -81,8 +81,6 @@ | |||
309 | 81 | property bool itemDestroyed: false | 81 | property bool itemDestroyed: false |
310 | 82 | sourceComponent: Component { | 82 | sourceComponent: Component { |
311 | 83 | Shell { | 83 | Shell { |
312 | 84 | property string shellMode: "full-greeter" /* default */ | ||
313 | 85 | |||
314 | 86 | usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex] | 84 | usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex] |
315 | 87 | orientation: Qt.PortraitOrientation | 85 | orientation: Qt.PortraitOrientation |
316 | 88 | primaryOrientation: Qt.PortraitOrientation | 86 | primaryOrientation: Qt.PortraitOrientation |
317 | 89 | 87 | ||
318 | === modified file 'tests/qmltests/tst_ShellWithPin.qml' | |||
319 | --- tests/qmltests/tst_ShellWithPin.qml 2015-06-15 22:40:10 +0000 | |||
320 | +++ tests/qmltests/tst_ShellWithPin.qml 2015-06-25 19:25:08 +0000 | |||
321 | @@ -69,8 +69,6 @@ | |||
322 | 69 | property bool itemDestroyed: false | 69 | property bool itemDestroyed: false |
323 | 70 | sourceComponent: Component { | 70 | sourceComponent: Component { |
324 | 71 | Shell { | 71 | Shell { |
325 | 72 | property string shellMode: "full-greeter" /* default */ | ||
326 | 73 | |||
327 | 74 | Component.onDestruction: { | 72 | Component.onDestruction: { |
328 | 75 | shellLoader.itemDestroyed = true | 73 | shellLoader.itemDestroyed = true |
329 | 76 | } | 74 | } |
FAILED: Continuous integration, rev:1823 jenkins. qa.ubuntu. com/job/ unity8- ci/5839/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- wily-touch/ 133 jenkins. qa.ubuntu. com/job/ unity8- wily-amd64- ci/119 jenkins. qa.ubuntu. com/job/ unity8- wily-i386- ci/120 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- wily-mako/ 86 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- wily-armhf/ 133 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- wily-armhf/ 133/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 21335
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/5839/ rebuild
http://