git.iko.soy/unity8
on xenial help sign in
fix some failing tests
17e4c2fLukáš Tinkl
tests/qmltests/tst_Shell.qml+2−12
compare with xenial
unifiedsplit
@@ -344,9 +344,9 @@ Rectangle {
344 var app2 = ApplicationManager.startApplication("webbrowser-app")
344 var app2 = ApplicationManager.startApplication("webbrowser-app")
345 var app3 = ApplicationManager.startApplication("camera-app")
345 var app3 = ApplicationManager.startApplication("camera-app")
346 var app4 = ApplicationManager.startApplication("facebook-webapp")
346 var app4 = ApplicationManager.startApplication("facebook-webapp")
347− var app5 = ApplicationManager.startApplication("calendar-app")
347+ var app5 = ApplicationManager.startApplication("camera-app")
348 var app6 = ApplicationManager.startApplication("gallery-app")
348 var app6 = ApplicationManager.startApplication("gallery-app")
349− var app7 = ApplicationManager.startApplication("camera-app")
349+ var app7 = ApplicationManager.startApplication("calendar-app")
350 waitUntilAppWindowIsFullyLoaded(app7);
350 waitUntilAppWindowIsFullyLoaded(app7);
351 }
351 }
352
352
@@ -1776,15 +1776,10 @@ Rectangle {
1776 tryCompare(panelButtons, "visible", false);
1776 tryCompare(panelButtons, "visible", false);
1777
1777
1778 appDelegate.maximize(false);
1778 appDelegate.maximize(false);
1779− tryCompare(panelButtons, "visible", true);
1780
1779
1781 shell.usageScenario = "phone";
1780 shell.usageScenario = "phone";
1782 waitForRendering(shell);
1781 waitForRendering(shell);
1783 tryCompare(panelButtons, "visible", false);
1782 tryCompare(panelButtons, "visible", false);
1784−
1785− shell.usageScenario = "desktop";
1786− waitForRendering(shell);
1787− tryCompare(panelButtons, "visible", true);
1788 }
1783 }
1789
1784
1790 function test_lockingGreeterHidesPanelButtons() {
1785 function test_lockingGreeterHidesPanelButtons() {
@@ -1798,15 +1793,10 @@ Rectangle {
1798 tryCompare(panelButtons, "visible", false);
1793 tryCompare(panelButtons, "visible", false);
1799
1794
1800 appDelegate.maximize(false);
1795 appDelegate.maximize(false);
1801− tryCompare(panelButtons, "visible", true);
1802
1796
1803 LightDM.Greeter.showGreeter();
1797 LightDM.Greeter.showGreeter();
1804 waitForRendering(shell);
1798 waitForRendering(shell);
1805 tryCompare(panelButtons, "visible", false);
1799 tryCompare(panelButtons, "visible", false);
1806−
1807− LightDM.Greeter.hideGreeter();
1808− waitForRendering(shell);
1809− tryCompare(panelButtons, "visible", true);
1810 }
1800 }
1811
1801
1812 function test_lifecyclePolicyForNonTouchApp_data() {
1802 function test_lifecyclePolicyForNonTouchApp_data() {