AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QUdpSocket: Don't test for .bytesAvailable on untrusted platforms

Browse Source 
FreeBSD, for example, does not have SO_NREAD and its FIONREAD returns
the full socket buffer size, including IP and UDP headers.

Change-Id: Ifb5969bf206e4cd7b14efffd14fb5d8ca778d16a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2017-11-28 13:35:58 -08:00
parent ff7dbda3b0
commit 637e8ebcc3
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
View File

@ -60,6 +60,13 @@
#include <errno.h> #include <errno.h>
#endif #endif
#ifdef Q_OS_UNIX
# include <sys/socket.h>
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(SO_NREAD)
# define RELIABLE_BYTES_AVAILABLE
#endif
Q_DECLARE_METATYPE(QHostAddress) Q_DECLARE_METATYPE(QHostAddress)
QT_FORWARD_DECLARE_CLASS(QUdpSocket) QT_FORWARD_DECLARE_CLASS(QUdpSocket)
@ -1806,7 +1813,9 @@ void tst_QUdpSocket::readyRead()
// make sure only one signal was emitted // make sure only one signal was emitted
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
QVERIFY(receiver.hasPendingDatagrams()); QVERIFY(receiver.hasPendingDatagrams());
#ifdef RELIABLE_BYTES_AVAILABLE
QCOMPARE(receiver.bytesAvailable(), qint64(2)); QCOMPARE(receiver.bytesAvailable(), qint64(2));
#endif
QCOMPARE(receiver.pendingDatagramSize(), qint64(2)); QCOMPARE(receiver.pendingDatagramSize(), qint64(2));
// write another datagram // write another datagram
@ -1828,7 +1837,9 @@ void tst_QUdpSocket::readyRead()
QTest::qWait(100); QTest::qWait(100);
QCOMPARE(spy.count(), 2); QCOMPARE(spy.count(), 2);
QVERIFY(receiver.hasPendingDatagrams()); QVERIFY(receiver.hasPendingDatagrams());
#ifdef RELIABLE_BYTES_AVAILABLE
QCOMPARE(receiver.bytesAvailable(), qint64(3)); QCOMPARE(receiver.bytesAvailable(), qint64(3));
#endif
QCOMPARE(receiver.pendingDatagramSize(), qint64(3)); QCOMPARE(receiver.pendingDatagramSize(), qint64(3));
} }
@ -1860,7 +1871,9 @@ void tst_QUdpSocket::readyReadForEmptyDatagram()
char buf[1]; char buf[1];
QVERIFY(receiver.hasPendingDatagrams()); QVERIFY(receiver.hasPendingDatagrams());
QCOMPARE(receiver.pendingDatagramSize(), qint64(0)); QCOMPARE(receiver.pendingDatagramSize(), qint64(0));
#ifdef RELIABLE_BYTES_AVAILABLE
QCOMPARE(receiver.bytesAvailable(), qint64(0)); QCOMPARE(receiver.bytesAvailable(), qint64(0));
#endif
QCOMPARE(receiver.readDatagram(buf, sizeof buf), qint64(0)); QCOMPARE(receiver.readDatagram(buf, sizeof buf), qint64(0));
} }
@ -1869,7 +1882,9 @@ void tst_QUdpSocket::async_readDatagramSlot()
char buf[1]; char buf[1];
QVERIFY(m_asyncReceiver->hasPendingDatagrams()); QVERIFY(m_asyncReceiver->hasPendingDatagrams());
QCOMPARE(m_asyncReceiver->pendingDatagramSize(), qint64(1)); QCOMPARE(m_asyncReceiver->pendingDatagramSize(), qint64(1));
#ifdef RELIABLE_BYTES_AVAILABLE
QCOMPARE(m_asyncReceiver->bytesAvailable(), qint64(1)); QCOMPARE(m_asyncReceiver->bytesAvailable(), qint64(1));
#endif
QCOMPARE(m_asyncReceiver->readDatagram(buf, sizeof(buf)), qint64(1)); QCOMPARE(m_asyncReceiver->readDatagram(buf, sizeof(buf)), qint64(1));
if (buf[0] == '2') { if (buf[0] == '2') {