git.iko.soy/unity8
on xenial help sign in
Set mock lightdm for PhoneStage test
commit4bc0a6cccf42d1869ba0c825c0efe92e14259b1c authorMichael Terry <michael.terry@canonical.com> dateTue 15 Jul 2014, 10:14 (12 years ago) parent0c8a3a9
2 files changed+3−3
compare with xenial
unifiedsplit
tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/tst_ShellWithPin.qml+2−2
tests/qmltests/CMakeLists.txt+1−1
@@ -75,4 +75,4 @@ add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=
7575# These MenuItemFactory tests need the test/mocks/ to come before plugins/
7676add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
7777add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
78−add_qml_test(Stages PhoneStage)
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 {
160160
161161 mouseClick(emergencyButton, units.gu(1), units.gu(1))
162162
163− tryCompare(lockscreen, "shown", false)
164163 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
164+ tryCompare(lockscreen, "shown", false)
165165 tryCompare(panel, "fullscreenMode", true)
166166 tryCompare(indicators, "available", false)
167167 tryCompare(launcher, "available", false)
@@ -170,9 +170,9 @@ Item {
170170 // Cancel emergency mode, and go back to normal
171171 LightDM.Greeter.showGreeter()
172172
173− tryCompare(lockscreen, "shown", true)
174173 tryCompare(greeter, "shown", true)
175174 tryCompare(greeter, "fakeActiveForApp", "")
175+ tryCompare(lockscreen, "shown", true)
176176 tryCompare(panel, "fullscreenMode", false)
177177 tryCompare(indicators, "available", true)
178178 tryCompare(launcher, "available", true)