diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-04-04 11:02:39 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-04-12 13:54:16 +0300 |
| commit | 69cd0bb5f7ccb9ab4c9afda29b2d0208a8f6b504 (patch) | |
| tree | 0c11bd187cb9eb89caa77f7e7cfd0e7f1dd9824d /tests | |
| parent | 2609a13d615d31f6f471395edc17e4bb932b08f1 (diff) | |
Disable bluetooth address check on autotest on Android
An emulator and an actual device behave slightly different in this
regard; while the emulator doesn't return a valid address, an actual
device always returns a valid address.
Fixes: QTBUG-102178
Pick-to: 6.2 6.3
Change-Id: I8fe195eba5f34563868925111aa60b77b6ee1c4c
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qbluetoothserver/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/qbluetoothserver/BLACKLIST b/tests/auto/qbluetoothserver/BLACKLIST deleted file mode 100644 index 6fad1be2..00000000 --- a/tests/auto/qbluetoothserver/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-102178 -[tst_receive] -android diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp index bc964ef7..3d757aa4 100644 --- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp +++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp @@ -197,10 +197,9 @@ void tst_QBluetoothServer::tst_receive() QTest::qWait(1000); if (!result) { -#ifdef Q_OS_ANDROID - // Android seems to always report adapter address - QVERIFY(server.serverAddress() != QBluetoothAddress()); -#else +#ifndef Q_OS_ANDROID + // Disable address check on Android as an actual device always returns + // a valid address, while the emulator doesn't QCOMPARE(server.serverAddress(), QBluetoothAddress()); #endif QCOMPARE(server.serverPort(), quint16(0)); |