Fix tutorial qmluitests with the new lightdm mock
commit49dce191f72617f042bf0e675553a5299b581d2f
authorMichael Terry <michael.terry@canonical.com>
dateThu 5 Feb 2015, 15:19 (12 years ago)
parentc1dd6a5
tests/qmltests/CMakeLists.txt+1−1
@@ -89,5 +89,5 @@ add_qml_test(Stages SurfaceContainer ENVIRONMENT)
8989add_qml_test(Stages SessionContainer ENVIRONMENT)
9090add_qml_test(Stages WindowMoveResizeArea)
9191add_qml_test(Stages Splash)
92−add_qml_test(Tutorial Tutorial ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
92+add_qml_test(Tutorial Tutorial)
9393add_qml_test(Wizard Wizard)
tests/qmltests/Tutorial/tst_Tutorial.qml+8
@@ -45,6 +45,13 @@ Item {
4545 }
4646 }
4747
48+ Component.onCompleted: {
49+ // must set the mock mode before loading the Shell
50+ LightDM.Greeter.mockMode = "single-pin";
51+ LightDM.Users.mockMode = "single-pin";
52+ shellLoader.active = true;
53+ }
54+
4855 Row {
4956 spacing: 0
5057 anchors.fill: parent
@@ -52,6 +59,7 @@ Item {
5259 Loader {
5360 id: shellLoader
5461
62+ active: false
5563 width: units.gu(40)
5664 height: units.gu(71)
5765