git.iko.soy/unity8
on xenial help sign in
Merge from dialer-above
1f8b23bMichael Terry
tests/qmltests/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -75,4 +75,4 @@ add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=
75# These MenuItemFactory tests need the test/mocks/ to come before plugins/
75# These MenuItemFactory tests need the test/mocks/ to come before plugins/
76add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
76add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
77add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
77add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
78−add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin")
78+add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
tests/qmltests/tst_ShellWithPin.qml+2−2
@@ -160,8 +160,8 @@ Item {
160
160
161 mouseClick(emergencyButton, units.gu(1), units.gu(1))
161 mouseClick(emergencyButton, units.gu(1), units.gu(1))
162
162
163− tryCompare(lockscreen, "shown", false)
164 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
163 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
164+ tryCompare(lockscreen, "shown", false)
165 tryCompare(panel, "fullscreenMode", true)
165 tryCompare(panel, "fullscreenMode", true)
166 tryCompare(indicators, "available", false)
166 tryCompare(indicators, "available", false)
167 tryCompare(launcher, "available", false)
167 tryCompare(launcher, "available", false)
@@ -170,9 +170,9 @@ Item {
170 // Cancel emergency mode, and go back to normal
170 // Cancel emergency mode, and go back to normal
171 LightDM.Greeter.showGreeter()
171 LightDM.Greeter.showGreeter()
172
172
173− tryCompare(lockscreen, "shown", true)
174 tryCompare(greeter, "shown", true)
173 tryCompare(greeter, "shown", true)
175 tryCompare(greeter, "fakeActiveForApp", "")
174 tryCompare(greeter, "fakeActiveForApp", "")
175+ tryCompare(lockscreen, "shown", true)
176 tryCompare(panel, "fullscreenMode", false)
176 tryCompare(panel, "fullscreenMode", false)
177 tryCompare(indicators, "available", true)
177 tryCompare(indicators, "available", true)
178 tryCompare(launcher, "available", true)
178 tryCompare(launcher, "available", true)