It's device UUID tracking that (unexpectedly) passes on macOS 13

pcolby · Jan 9, 2025 · 5625c06 · 5625c06
1 parent 1613170
commit 5625c06
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/unit/cli/testinfocommand.cpp b/test/unit/cli/testinfocommand.cpp
@@ -106,13 +106,14 @@ void TestInfoCommand::serviceDetailsDiscovered()
     command.serviceDetailsDiscovered();
 
     #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-    if (!info.deviceUuid().isNull()) {
+    if ((!info.deviceUuid().isNull()) &&
+        (!(QOperatingSystemVersion::current() <= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 13)))) {
         // Fixed (though not called out) by https://bugreports.qt.io/browse/QTBUG-75348
-        QEXPECT_FAIL("", "QLowEnergyController fails to track device UUIDs prior to Qt 5.14.", Continue);
+        QEXPECT_FAIL("", "QLowEnergyController fails to track device UUIDs prior to Qt 5.14, except on macOS 13-", Continue);
     }
     #if defined(Q_OS_MACOS)
-    else if ((!info.address().isNull()) && (QOperatingSystemVersion::current().majorVersion() >= 14)) {
-        QEXPECT_FAIL("", "On macOS 14+, QLowEnergyController fails to track device addresses prior to Qt 5.14.", Continue);
+    else if (!info.address().isNull()) {
+        QEXPECT_FAIL("", "On macOS, QLowEnergyController fails to track device addresses prior to Qt 5.14.", Continue);
     }
     #endif // macOS
     #endif // < Qt 5.14