on xenial help sign in
Merge test fixes
commitc6df1f053e69e63117f1688377844ac9f9a4250d authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 21 Sep 2015, 11:42 (11 years ago) parent0183722ff69524
2 files changed+3−3
tests/CMakeLists.txt+1−1 tests/qmltests/Dash/tst_Card.qml+2−2
tests/CMakeLists.txt+1−1
@@ -47,7 +47,7 @@ macro(unity8_parse_arguments)
4747 if(U8TEST_LIGHTDM)
4848 list(APPEND ld_paths
4949 ${UNITY_MOCKPATH}/libusermetrics
50− ${UNITY_MOCKPATH}/LightDM/liblightdm
50+ ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm
5151 )
5252 endif()
5353
tests/qmltests/Dash/tst_Card.qml+2−2
@@ -473,14 +473,14 @@ Rectangle {
473473
474474 card.cardData["mascot"] = "somethingbroken2";
475475 card.cardDataChanged();
476− compare(mascotImage.image.status, Image.Error);
476+ compare(mascotImage.status, Image.Error);
477477
478478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};
479479 cardTool.componentsChanged();
480480 card.cardData["mascot"] = "somethingbroken2";
481481 card.cardDataChanged();
482482 waitForRendering(card);
483− tryCompare(mascotImage.image, "status", Image.Ready);
483+ tryCompare(mascotImage, "status", Image.Ready);
484484 }
485485
486486 function test_font_weights_data() {