diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-12 12:31:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 10:58:01 +0200 |
| commit | de750dc7971b3dfda350b5602501b6215ef3da8d (patch) | |
| tree | dce40c350074c2d18878e505f1d4ffe85dd192be /tests/auto/qbluetoothlocaldevice | |
| parent | 80d540625f87eaecfae24a7b02d86ef59afe8fef (diff) | |
Make QBluetoothLocalDevice pass on Bluez 5
Change-Id: Ide3ea0ebdbf6876163f17b8ab8ca9fdafaca4d43
Reviewed-by: Oleg Shparber <trollixx@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests/auto/qbluetoothlocaldevice')
| -rw-r--r-- | tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index 3285592e..e997fa9e 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp @@ -295,16 +295,18 @@ void tst_QBluetoothLocalDevice::tst_pairDevice_data() QTest::newRow("UnPaired Device: DUMMY->unpaired") << QBluetoothAddress("11:00:00:00:00:00") << QBluetoothLocalDevice::Unpaired << 1000 << false; + //Bluez5 may have to do a device search which can take up to 20s QTest::newRow("UnPaired Device: DUMMY->paired") << QBluetoothAddress("11:00:00:00:00:00") - << QBluetoothLocalDevice::Paired << 1000 << true; + << QBluetoothLocalDevice::Paired << 21000 << true; QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress() << QBluetoothLocalDevice::Unpaired << 1000 << true; if (!remoteDevice.isNull()) { QTest::newRow("UnParing Test device 1") << QBluetoothAddress(remoteDevice) << QBluetoothLocalDevice::Unpaired << 1000 << false; + //Bluez5 may have to do a device search which can take up to 20s QTest::newRow("Pairing Test Device") << QBluetoothAddress(remoteDevice) - << QBluetoothLocalDevice::Paired << 10000 << false; + << QBluetoothLocalDevice::Paired << 21000 << false; QTest::newRow("Pairing upgrade for Authorization") << QBluetoothAddress(remoteDevice) << QBluetoothLocalDevice::AuthorizedPaired << 1000 << false; QTest::newRow("Unpairing Test device 2") << QBluetoothAddress(remoteDevice) |