diff options
| -rw-r--r-- | tests/auto/qml/qquickfolderlistmodel/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qquickfolderlistmodel/BLACKLIST b/tests/auto/qml/qquickfolderlistmodel/BLACKLIST deleted file mode 100644 index f7bdb9c422..0000000000 --- a/tests/auto/qml/qquickfolderlistmodel/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -[nameFilters] -macos ci # QTBUG-90468 -msvc-2015 -msvc-2017 diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp index 5e5dab3f34..10c5382455 100644 --- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp +++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp @@ -196,7 +196,11 @@ void tst_qquickfolderlistmodel::nameFilters() this, SLOT(removed(QModelIndex,int,int))); QTRY_VERIFY(flm->rowCount() > 0); + // read an invalid directory first... + flm->setProperty("folder", testFileUrl("nosuchdirectory")); + QTRY_COMPARE(flm->property("count").toInt(),0); flm->setProperty("folder", testFileUrl("resetfiltering")); + // so that the QTRY_COMPARE for 3 entries will process queued signals QTRY_COMPARE(flm->property("count").toInt(),3); // all files visible int count = flm->rowCount(); |