git.iko.soy/unity8
on xenial help sign in
merge trunk and fix conflict
commitd635c86fe8735c797343e6eef5314b2e27ad1653 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 8 Oct 2015, 13:50 (11 years ago) parentacbf68ccf99aec
10 files changed+124−65
compare with xenial
unifiedsplit
debian/changelog+35 plugins/Powerd/Powerd.h+2 po/ast.po+26−26 po/br.po+5−5 po/ja.po+4−4 po/ug.po+4−4 qml/Notifications/Notification.qml+1−1 qml/Wizard/Pages/60-reporting.qml+10 tests/qmltests/Launcher/tst_Launcher.qml+24−13 tests/qmltests/Wizard/tst_Wizard.qml+13−12
debian/changelog+35
@@ -1,3 +1,38 @@
1+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium
2+
3+ [ CI Train Bot ]
4+ * Resync trunk.
5+
6+ [ Lukáš Tinkl ]
7+ * Wizard: skip the reporting page if the system is configured not to
8+ report crashes (LP: #1494442)
9+
10+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000
11+
12+unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium
13+
14+ [ Alexandros Frantzis ]
15+ * Use power state change reason SnapDecision to turn screen on when a
16+ SnapDecision arrives (LP: #1291455)
17+
18+ [ CI Train Bot ]
19+ * New rebuild forced.
20+
21+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 01 Oct 2015 12:04:04 +0000
22+
23+unity8 (8.11+15.10.20150930.1-0ubuntu1) wily; urgency=medium
24+
25+ [ Albert Astals Cid ]
26+ * Make Launcher::test_quickListMenuOnRMB stable (LP: #1500359)
27+
28+ [ CI Train Bot ]
29+ * New rebuild forced.
30+
31+ [ Michael Zanetti ]
32+ * Stabilize Launcher DND test
33+
34+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 30 Sep 2015 10:09:33 +0000
35+
136unity8 (8.11+15.10.20150925-0ubuntu1) wily; urgency=medium
237
338 [ Albert Astals Cid ]
plugins/Powerd/Powerd.h+2
@@ -38,6 +38,8 @@ public:
3838 PowerKey = 2, // Display changed state due to user pressing power key
3939 Proximity = 3, // Display changed state due to proximity events
4040 Notification = 4, // Display changed state due to user notification
41+ SnapDecision = 5, // Display changed state due to snap decision prompt
42+ CallDone = 6, // Display changed state due to voice call end
4143 };
4244
4345 enum Status {
po/ast.po+26−26
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2015-06-11 23:39+0000\n"
12−"Last-Translator: enolp <enolp@softastur.org>\n"
11+"PO-Revision-Date: 2015-10-06 12:07+0000\n"
12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:42+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-07 06:06+0000\n"
19+"X-Generator: Launchpad (build 17802)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -29,7 +29,7 @@ msgstr "Anclar atayu"
2929
3030#: plugins/Unity/Launcher/launcheritem.cpp:52
3131msgid "Quit"
32−msgstr ""
32+msgstr "Colar"
3333
3434#: plugins/Unity/Launcher/launcheritem.cpp:106
3535msgid "Unpin shortcut"
@@ -41,14 +41,14 @@ msgstr "Desanclar atayu"
4141#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
4242#: plugins/Utils/relativetimeformatter.cpp:157
4343msgid "Yesterday %l:%M %p"
44−msgstr ""
44+msgstr "Ayeri %l:%M %p"
4545
4646#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4747#. This format string is used for showing, on a 12-hour clock, times that happened today.
4848#. en_US example: "%l:%M %p" --> "1:00 PM"
4949#: plugins/Utils/relativetimeformatter.cpp:164
5050msgid "%l:%M %p"
51−msgstr ""
51+msgstr "%l:%M %p"
5252
5353#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5454#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -56,7 +56,7 @@ msgstr ""
5656#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5757#: plugins/Utils/relativetimeformatter.cpp:172
5858msgid "Tomorrow %l:%M %p"
59−msgstr ""
59+msgstr "Mañana %l:%M %p"
6060
6161#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6262#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -64,7 +64,7 @@ msgstr ""
6464#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6565#: plugins/Utils/relativetimeformatter.cpp:181
6666msgid "%a %l:%M %p"
67−msgstr ""
67+msgstr "%a %l:%M %p"
6868
6969#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7070#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -73,7 +73,7 @@ msgstr ""
7373#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7474#: plugins/Utils/relativetimeformatter.cpp:190
7575msgid "%a %d %b %l:%M %p"
76−msgstr ""
76+msgstr "%a %b %d %l:%M %p"
7777
7878#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7979#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -81,14 +81,14 @@ msgstr ""
8181#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
8282#: plugins/Utils/relativetimeformatter.cpp:201
8383msgid "Yesterday %H:%M"
84−msgstr ""
84+msgstr "Ayeri %H:%M"
8585
8686#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8787#. This format string is used for showing, on a 24-hour clock, times that happened today.
8888#. en_US example: "%H:%M" --> "13:00"
8989#: plugins/Utils/relativetimeformatter.cpp:208
9090msgid "%H:%M"
91−msgstr ""
91+msgstr "%H:%M"
9292
9393#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9494#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -96,7 +96,7 @@ msgstr ""
9696#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9797#: plugins/Utils/relativetimeformatter.cpp:216
9898msgid "Tomorrow %H:%M"
99−msgstr ""
99+msgstr "Mañana %H:%M"
100100
101101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
102102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -104,7 +104,7 @@ msgstr ""
104104#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
105105#: plugins/Utils/relativetimeformatter.cpp:225
106106msgid "%a %H:%M"
107−msgstr ""
107+msgstr "%a %H:%M"
108108
109109#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
110110#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -113,7 +113,7 @@ msgstr ""
113113#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
114114#: plugins/Utils/relativetimeformatter.cpp:234
115115msgid "%a %d %b %H:%M"
116−msgstr ""
116+msgstr "%a %b %d %H:%M"
117117
118118#: qml/Components/DelayedLockscreen.qml:49
119119msgid "Device Locked"
@@ -198,7 +198,7 @@ msgstr "Sí"
198198#: qml/Components/Dialogs.qml:203
199199msgctxt "Title: Power off/Restart dialog"
200200msgid "Power"
201−msgstr ""
201+msgstr "Apagáu"
202202
203203#: qml/Components/Dialogs.qml:204
204204msgid ""
@@ -378,7 +378,7 @@ msgstr "Sentímoslo, contraseña incorreuta"
378378#: qml/Greeter/NarrowView.qml:121
379379msgctxt "passphrase"
380380msgid "Please re-enter"
381−msgstr ""
381+msgstr "Vuelve a escribila"
382382
383383#: qml/Greeter/NarrowView.qml:122
384384msgid "Sorry, incorrect passcode"
@@ -404,32 +404,32 @@ msgstr "Nun ta reproduciéndose nada"
404404#, qt-format
405405msgid "%1 hour"
406406msgid_plural "%1 hours"
407−msgstr[0] ""
408−msgstr[1] ""
407+msgstr[0] "%1 hora"
408+msgstr[1] "%1 hores"
409409
410410#: qml/Panel/Indicators/MenuItemFactory.qml:851
411411#, qt-format
412412msgid "%1 minute"
413413msgid_plural "%1 minutes"
414−msgstr[0] ""
415−msgstr[1] ""
414+msgstr[0] "%1 minutu"
415+msgstr[1] "%1 minutos"
416416
417417#: qml/Panel/Indicators/MenuItemFactory.qml:856
418418#, qt-format
419419msgid "%1 second"
420420msgid_plural "%1 seconds"
421−msgstr[0] ""
422−msgstr[1] ""
421+msgstr[0] "%1 segundu"
422+msgstr[1] "%1 segundos"
423423
424424#: qml/Panel/Indicators/MenuItemFactory.qml:859
425425msgid "0 seconds"
426−msgstr ""
426+msgstr "0 segundos"
427427
428428#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
429429#: qml/Panel/Indicators/MenuItemFactory.qml:861
430430#, qt-format
431431msgid "%1 remaining"
432−msgstr ""
432+msgstr "Queden %1"
433433
434434#: qml/Panel/Indicators/MenuItemFactory.qml:867
435435msgid "In queue…"
@@ -462,7 +462,7 @@ msgstr "Responder"
462462
463463#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
464464msgid "Call back"
465−msgstr ""
465+msgstr "Devolver llamada"
466466
467467#: qml/Panel/Indicators/ModemInfoItem.qml:105
468468msgid "Unlock SIM"
po/br.po+5−5
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2015-08-25 14:12+0000\n"
11+"PO-Revision-Date: 2015-10-05 06:47+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"
19+"X-Generator: Launchpad (build 17796)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -29,7 +29,7 @@ msgstr "Spilhennañ ar verradenn"
2929
3030#: plugins/Unity/Launcher/launcheritem.cpp:52
3131msgid "Quit"
32−msgstr ""
32+msgstr "Mont kuit"
3333
3434#: plugins/Unity/Launcher/launcheritem.cpp:106
3535msgid "Unpin shortcut"
@@ -465,7 +465,7 @@ msgstr "Respont"
465465
466466#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
467467msgid "Call back"
468−msgstr ""
468+msgstr "Gervel en-dro"
469469
470470#: qml/Panel/Indicators/ModemInfoItem.qml:105
471471msgid "Unlock SIM"
po/ja.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2014-11-20 05:08+0000\n"
11+"PO-Revision-Date: 2015-10-05 10:05+0000\n"
1212"Last-Translator: Kentaro Kazuhama <Unknown>\n"
1313"Language-Team: Japanese <ja@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"
19+"X-Generator: Launchpad (build 17796)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -390,7 +390,7 @@ msgstr "グループ通話"
390390
391391#: qml/Panel/Indicators/MenuItemFactory.qml:718
392392msgid "Nothing is playing"
393−msgstr ""
393+msgstr "再生するものがありません"
394394
395395#: qml/Panel/Indicators/MenuItemFactory.qml:847
396396#, qt-format
po/ug.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2015-09-24 05:59+0000\n"
11+"PO-Revision-Date: 2015-10-02 03:54+0000\n"
1212"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"
1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-03 05:40+0000\n"
19+"X-Generator: Launchpad (build 17783)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -96,7 +96,7 @@ msgstr ""
9696#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9797#: plugins/Utils/relativetimeformatter.cpp:216
9898msgid "Tomorrow %H:%M"
99−msgstr ""
99+msgstr "ئەتە %H:%M"
100100
101101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
102102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
qml/Notifications/Notification.qml+1−1
@@ -90,7 +90,7 @@ Item {
9090 // Turn on screen as needed (Powerd.Notification means the screen
9191 // stays on for a shorter amount of time)
9292 if (type == Notification.SnapDecision) {
93− Powerd.setStatus(Powerd.On, Powerd.Unknown);
93+ Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
9494 } else if (type != Notification.Confirmation) {
9595 Powerd.setStatus(Powerd.On, Powerd.Notification);
9696 }
qml/Wizard/Pages/60-reporting.qml+10
@@ -16,14 +16,24 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import Ubuntu.SystemSettings.Diagnostics 1.0
1920import ".." as LocalComponents
2021
2122LocalComponents.Page {
23+ id: reportingPage
2224 objectName: "reportingPage"
2325
2426 title: i18n.tr("Improving your experience")
2527 forwardButtonSourceComponent: forwardButton
2628
29+ skipValid: false
30+ skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
31+
32+ UbuntuDiagnostics {
33+ id: diagnostics
34+ Component.onCompleted: reportingPage.skipValid = true;
35+ }
36+
2737 Column {
2838 id: column
2939 anchors.fill: content
tests/qmltests/Launcher/tst_Launcher.qml+24−13
@@ -200,7 +200,10 @@ Item {
200200 verify(!!panel);
201201
202202 // wait until it gets fully extended
203− tryCompare(panel, "x", 0);
203+ // a tryCompare doesn't work since
204+ // compare(-0.000005917593600024418, 0);
205+ // is true and in this case we want exactly 0 or will have pain later on
206+ tryCompareFunction( function(){ return panel.x === 0; }, true );
204207 tryCompare(launcher, "state", "visible");
205208 }
206209
@@ -479,16 +482,21 @@ Item {
479482 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
480483
481484 // Doing longpress
482− var currentMouseX = draggedItem.width / 2
483− var currentMouseY = draggedItem.height / 2
484− mousePress(draggedItem, currentMouseX, currentMouseY)
485+ var mouseOnLauncher = launcher.mapFromItem(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
486+ var currentMouseX = mouseOnLauncher.x
487+ var currentMouseY = mouseOnLauncher.y
488+ var newMouseX = currentMouseX
489+ var newMouseY = currentMouseY
490+ mousePress(launcher, currentMouseX, currentMouseY)
485491 // DraggedItem needs to hide and fakeDragItem become visible
486492 tryCompare(draggedItem, "itemOpacity", 0)
487493 tryCompare(fakeDragItem, "visible", true)
488494
489495 // Dragging a bit (> 1.5 gu)
490− currentMouseX -= units.gu(2)
491− mouseMove(draggedItem, currentMouseX, currentMouseY)
496+ newMouseX -= units.gu(2)
497+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
498+ currentMouseX = newMouseX
499+
492500 // Other items need to expand and become 0.6 opaque
493501 tryCompare(item0, "angle", 0)
494502 tryCompare(item0, "itemOpacity", 0.6)
@@ -496,18 +504,21 @@ Item {
496504 if (data.fullDrag) {
497505 // Dragging a bit more
498506 if (data.orientation == ListView.Horizontal) {
499− currentMouseX -= units.gu(15)
500− mouseMove(draggedItem, currentMouseX, currentMouseY, 100)
507+ newMouseX += units.gu(15)
508+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
509+ currentMouseX = newMouseX
501510
502511 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
503512 tryCompare(draggedItem, "height", units.gu(1))
504513
505514 // Dragging downwards. Item needs to move in the model
506− currentMouseY -= initialItemHeight * 1.5
507− mouseMove(draggedItem, currentMouseX, currentMouseY)
515+ newMouseY -= initialItemHeight * 1.5
516+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
517+ currentMouseY = newMouseY
508518 } else if (data.orientation == ListView.Vertical) {
509− currentMouseY -= initialItemHeight * 1.5
510− mouseMove(draggedItem, currentMouseX, currentMouseY, 100)
519+ newMouseY -= initialItemHeight * 1.5
520+ mouseFlick(launcher, currentMouseX, currentMouseY, newMouseX, newMouseY, false, false, 100)
521+ currentMouseY = newMouseY
511522
512523 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
513524 tryCompare(draggedItem, "height", units.gu(1))
@@ -519,7 +530,7 @@ Item {
519530 }
520531
521532 // Releasing and checking if initial values are restored
522− mouseRelease(draggedItem)
533+ mouseRelease(launcher)
523534 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
524535 tryCompare(draggedItem, "itemOpacity", 1)
525536 tryCompare(fakeDragItem, "visible", false)
tests/qmltests/Wizard/tst_Wizard.qml+13−12
@@ -158,13 +158,16 @@ Item {
158158 return stack.currentPage;
159159 }
160160
161− function goToPage(name, skipSim, skipLocation) {
161+ function goToPage(name, skipSim, skipLocation, skipReporting) {
162162 if (skipSim === undefined) {
163163 skipSim = false;
164164 }
165165 if (skipLocation === undefined) {
166166 skipLocation = false;
167167 }
168+ if (skipReporting === undefined) {
169+ skipReporting = false;
170+ }
168171
169172 var page = waitForPage("languagePage");
170173 if (name === page.objectName) return page;
@@ -191,9 +194,11 @@ Item {
191194 tap(findChild(page, "forwardButton"));
192195 }
193196
194− page = waitForPage("reportingPage");
195− if (name === page.objectName) return page;
196− tap(findChild(page, "forwardButton"));
197+ if (!skipReporting) {
198+ page = waitForPage("reportingPage");
199+ if (name === page.objectName) return page;
200+ tap(findChild(page, "forwardButton"));
201+ }
197202
198203 page = waitForPage("finishedPage");
199204 if (name === page.objectName) return page;
@@ -337,8 +342,6 @@ Item {
337342 tap(findChild(page, "forwardButton"));
338343 page = waitForPage("locationPage");
339344 tap(findChild(page, "forwardButton"));
340− page = waitForPage("reportingPage");
341− tap(findChild(page, "forwardButton"));
342345 page = waitForPage("finishedPage");
343346 tap(findChild(page, "forwardButton"));
344347
@@ -390,8 +393,6 @@ Item {
390393 tap(findChild(page, "forwardButton"));
391394 page = waitForPage("locationPage");
392395 tap(findChild(page, "forwardButton"));
393− page = waitForPage("reportingPage");
394− tap(findChild(page, "forwardButton"));
395396 page = waitForPage("finishedPage");
396397 tap(findChild(page, "forwardButton"));
397398
@@ -402,7 +403,7 @@ Item {
402403 }
403404
404405 function test_passwdSwipe() {
405− goToPage(null);
406+ goToPage(null, false, false, true);
406407
407408 tryCompare(setSecuritySpy, "count", 1);
408409 compare(setSecuritySpy.signalArguments[0][0], "");
@@ -412,12 +413,12 @@ Item {
412413
413414 function test_locationSkipNoPath() {
414415 AccountsService.hereLicensePath = "";
415− goToPage("reportingPage", false, true);
416+ goToPage("finishedPage", false, true, true);
416417 }
417418
418419 function test_locationSkipNoFiles() {
419420 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
420− goToPage("reportingPage", false, true);
421+ goToPage("finishedPage", false, true, true);
421422 }
422423
423424 function test_locationWaitOnPath() {
@@ -434,7 +435,7 @@ Item {
434435 compare(stack.currentPage.skipValid, false);
435436
436437 AccountsService.hereLicensePath = "";
437− waitForPage("reportingPage");
438+ waitForPage("finishedPage", false, false, true);
438439 }
439440
440441 function test_locationGpsOnly() {