summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
Commit message (Collapse)AuthorAgeFilesLines
* tests: Replace Q_OS_MACX -> Q_OS_OSXSergio Ahumada2013-10-212-2/+2
| | | | | | | | Use the correct identifier for the OS X operating system. Change-Id: I7158a6b77e5e7418bc6b0a565f003500820a346d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* tst_QNetworkReply: Don't remove file if never createdTor Arne Vestbø2013-09-261-1/+2
| | | | | | | If we end up QSKIP'ing the test 'wronlyFileName' is never created. Change-Id: I2ccbfdb630b58d7904e73b476a65a82a45ab90d7 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-072-1/+5
|\ | | | | | | Change-Id: I9ee4176f0a0078908d49896508826154c9f71530
| * QTcpSocket auto test: rely on IMAP port, not SMTP portPeter Hartmann2013-08-271-1/+1
| | | | | | | | | | | | | | | | The new test server image will not have a SMTP service installed, and the network self test does not check for that either. Change-Id: I1063777832148e184de4ddf21d9154364f644e1e Reviewed-by: Richard J. Moore <rich@kde.org>
| * QNetworkReply auto test: Skip tests failing due to Squid issuesPeter Hartmann2013-08-271-0/+4
| | | | | | | | | | | | | | | | | | This test works with no Qt version (4 or 5) when testing with the Squid (HTTP proxy) version deployed on the new test server image. Task-number: QTBUG-33180 Change-Id: If244526a4baed9f3836dade007fe0f15649a8f86 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add QT_NO_PROCESS guards in tests where they are missingAndrew Knight2013-09-031-0/+4
| | | | | | | | | | | | | | | | | | | | A handful of tests lack QT_NO_PROCESS guards, making them non-compilable on Qt builds with no QProcess support. This commit does not change QProcess-specific tests, which should be left out of the build using the .pro file mechanism. Change-Id: Iac8562428abc1f59ccbb23bf5c3a919785e41f12 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-276-12/+6
|\| | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| * tests: Make the QT assignments more explicitSergio Ahumada2013-08-216-12/+6
| | | | | | | | | | | | | | | | Remove unused 'QT -= gui' and replace some others with 'QT = core ...' Change-Id: I2d14fae963afc21dbd21a4acdbba2c30cdf8fa61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Thiago Macieira2013-08-221-5/+13
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-211-5/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| | * test: Skip some more qsslsocket flaky tests [part 2]Sergio Ahumada2013-08-161-5/+13
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29941 Change-Id: I28e71f952fcade6ab0aa76db71a1e2f408952830 Reviewed-by: Richard J. Moore <rich@kde.org>
* | | QNetworkReply auto test: adapt to new session life timePeter Hartmann2013-08-211-5/+7
|/ / | | | | | | | | | | | | | | | | ... supported on the new test server. Once the new server image is in place, we can only allow for the new life time hint of 300 seconds. Task-number: QTBUG-33040 Change-Id: Id6ad9983789cc6badf3fc2f6628bf79379988201 Reviewed-by: Richard J. Moore <rich@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-142-37/+130
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| * test: Skip some more qsslsocket flaky testsSergio Ahumada2013-08-131-4/+9
| | | | | | | | | | | | Task-number: QTBUG-29941 Change-Id: Iaf1c4834ef36db284464184639a1ab00928510cf Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| * test: Skip some flaky tests, but only if they are expected to failSergio Ahumada2013-08-101-33/+77
| | | | | | | | | | | | Task-number: QTBUG-29941 Change-Id: Ieca736c26711fa292855b3281229282628dce608 Reviewed-by: Richard J. Moore <rich@kde.org>
| * QHttpMultiPart: fix data corruption in readData methodPeter Hartmann2013-07-291-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When readData() is called repeatedly, we need to keep track which part of the multipart message we are currently reading from. Hereby we also need to take the boundary size into account, and not only the size of the multipart; otherwise we would skip a not completely read part. This would then later lead to advancing the read pointer by negative indexes and data loss. Task-number: QTBUG-32534 Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Include sockLib header to enable usage of socket functions on VxWorksPasi Petäjäjärvi2013-08-061-0/+4
| | | | | | | | | | | | | | | | Functions normally found from <sys/socket.h> are available on VxWorks from <sockLib.h> header. Change-Id: I2263ec40ba9f37bc95755b633fb43d66ceb2777c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-233-7/+62
|\| | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| * Ignore or suppress warning and debug messages in tst_QLocalSocketThiago Macieira2013-07-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | The one in tst_QLocalSocket::writeToClientAndDisconnect just needed proper ordering: that's what waitForDisconnect is for. At the same time, we need to make sure we get the same message from all three implementations of QLocalSocket::waitForDisconnect (and without the useless space at the end). Change-Id: I21364263cf908df022df814a6a39fcb5783e84e6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * Fix incomplete override of QIODevice::open in QProcess and QLocalSocketThiago Macieira2013-07-201-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule for a new override is that it must still work if the old implementation is called. The catch is that any class that derives from QProcess and isn't recompiled will still have QIODevice::open in its virtual table. That is equivalent to overriding open() and calling QIODevice::open() (like the tests). In Qt 5.0, QProcess::start() called QIODevice::open directly, not the virtual open(), so there's no expectation that a user-overridden open() be called. With that in mind, simply fix QProcess::start to not call the virtual open at all. Similarly with QLocalSocket, the calls to open were always non-virtual. Task-number: QTBUG-32284 Change-Id: I88925f0ba08bc23c849658b54582744997e69a4c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Add a test for QLocalSocket::openThiago Macieira2013-07-201-0/+23
| | | | | | | | | | | | | | | | This should have been done in the commit that introduced open (953255abab0f99afe7559da93ba18a876805d78d), but was missing. Change-Id: I1c2de4ad5fa42aa5b90646e7d4d7d1b1570a0f87 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * test: Mark tst_QNetworkReply::backgroundRequestInterruption() as XFAIL on OS ↵Sergio Ahumada2013-07-151-0/+4
| | | | | | | | | | | | | | | | | | X 10.8 Task-number: QTBUG-32435 Change-Id: Ibc4495126b066c17e6a4477f403677b9fc9da453 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * test: organize tst_qnetworkreply .pro file a bitSergio Ahumada2013-07-151-4/+1
| | | | | | | | | | | | | | | | | | - Don't run this test in parallel - Remove redundant QT=-gui - Place the insignificant_test marks together Change-Id: I078fa29a4dccef9af8798792d06d51835b4b8934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-152-4/+0
|\| | | | | | | Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
| * Remove Nokia-domains in commented-out test code.Friedemann Kleint2013-07-122-4/+0
| | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: Ida7d54aba9cde5c472ff6bb2696d1201ba4f2199 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-1/+1
|\| | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * Further followup to Q_OS_MACX changes.Jake Petroules2013-06-241-1/+1
| | | | | | | | | | | | | | | | Flip !Q_OS_IOS conditions to Q_OS_MACX where it seems appropriate, remove a redundant condition in qtextcodec_p.h. Change-Id: I21c8c0c490f1eb4a9337a7f2f3e907c125489438 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-124-7/+12
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| * tst_qnetworkproxyfactory: Fix warnings about unused variables.Friedemann Kleint2013-06-071-0/+5
| | | | | | | | | | Change-Id: I6fa08353ebea5cdd7fc7a0c982bf1b9d34bbc077 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Update the DNS and name-resolver tests to the official zoneThiago Macieira2013-06-073-7/+7
| | | | | | | | | | Change-Id: I02feb8029461383f38bcbdca138789b119a58b5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-53/+82
|\| | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * QDnsLookup: test multiple TXT answers tooThiago Macieira2013-06-041-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | The TXT record is particular because each RR can contain multiple text strings. So we need to join each RR's texts too. To make it easy, I've made everything be QStrings. Change-Id: Ia0506544b913585e7be860c81077cff8e0dab547 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * QDnsLookup: test MX and SRV records that can change orderThiago Macieira2013-06-041-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DNS protocol changes the order of the RRs in each reply it sends, in an effort to balance the load in servers. For most tests, to ensure that we get always the same result, we simply sort it back. For MX and SRV, we can't sort because we also need to test that QDnsLookup sorted correctly according to priority. So instead allow that test to have multiple alternatives. Change-Id: I5c119f907b31789de5c9cf2471cc82ecd140d06f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QSslConfiguration: add API to persist and resume SSL sessionsPeter Hartmann2013-05-101-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | Session tickets can be cached on the client side for hours (e.g. graph.facebook.com: ~ 24 hours, api.twitter.com: 4 hours), because the server does not need to maintain state. We need public API for it so an application can cache the session (e.g. to disk) and resume a session already with the 1st handshake, saving one network round trip. Task-number: QTBUG-20668 Change-Id: I10255932dcd528ee1231538cb72b52b97f9f4a3c Reviewed-by: Richard J. Moore <rich@kde.org>
* | Merge branch 'stable' into devSergio Ahumada2013-05-073-61/+107
|\| | | | | | | Change-Id: Ica003a10ede86914bbbb062a2dc277a2ce39a259
| * Autotest: Use the new test zone in all name-lookup unit testsThiago Macieira2013-05-073-61/+107
| | | | | | | | | | | | | | | | | | | | I also modified tst_QDnsLookup the test to use ';' as a separator as opposed to spaces because I added MX and SRV records with multiple RRs. Change-Id: I62c7b6ad342c1bb23c4d9ac9730e35ab422e3ea2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-292-1/+43
|\| | | | | | | Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
| * SSL internals: do not write after shutting down the socketPeter Hartmann2013-04-231-1/+2
| | | | | | | | | | | | | | | | | | ... but rather throw an error, so the HTTP layer can recover from a SSL shutdown gracefully. In case the other side sent us a shutdown, we should not send one as well, as it results in an error. Change-Id: Ie7a56cf3008b6ead912aade18dbec67846e2a87e Reviewed-by: Richard J. Moore <rich@kde.org>
| * Fix retrieving of the generic system proxy via environment variablesThomas McGuire2013-04-231-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | ignoreProxyFor() always returned true if the no_proxy was not set, which resulted in the first token being an empty QByteArray, causing the endsWith() check to always evaluate to true. Add a unit test that is enabled for those platforms that use the generic system proxy. Change-Id: I6081ad5e0b8e2c3fee1568835907c32bde5b7772 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | SSL namespace: Add enum to disable SSL session sharingPeter Hartmann2013-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | There is already an enum to disable SSL session tickets, which has been used to disable session sharing for now. However, SSL session sharing is not the same as SSL session tickets: Session sharing is built into the SSL protocol, while session tickets is a TLS extension (RFC 5077). Change-Id: If76b99c94b346cfb00e47366e66098f6334fd9bc Reviewed-by: Richard J. Moore <rich@kde.org>
* | QTcpSocket bind() auto test: return instead of QSKIPPeter Hartmann2013-04-051-1/+1
| | | | | | | | | | | | | | | | | | ... because SkipSingle was removed in Qt5, and a QSKIP would result in the SSL tests not being executed. This can be reverted once QTBUG-29972 is fixed. Change-Id: I3663ee52f00c3f4391ce78cf63bd444656d79cb3 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | QNetworkAccessManager: track online / accessible state without sessionPeter Hartmann2013-04-021-11/+24
|/ | | | | | | | | | | | In particular, set online state right upon construction of the QNetworkAccessManager instance. Therefor, QNAM needs an instance of a QNetworkConfigurationManager internally. Before, this would only work properly if a network session was created. Now, networkAccessible() returns the correct status. Change-Id: I7ff9ccfd18ad376a131fc5977843b55bf185fba0 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QNetworkInterface auto test: do not abort without sessionPeter Hartmann2013-03-261-5/+8
| | | | | | | ... but only if the QNetworkConfiguration manager requires one. Change-Id: I1c69c43438f1df9080d207c8598a42201f759c5b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-211-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * Skip unstable tst_QSslSocket test case.Samuel Rødal2013-03-201-0/+2
| | | | | | | | | | | | | | | | | | | | The connection to qt-project.org seems to be the one that causes this particular test case to fail. Task-number: QTBUG-29941 Change-Id: Ie5e430646997e86e3acb04132cd90a1773a091da Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Merge branch 'dev' into stableOswald Buddenhagen2013-03-2022-63/+329
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
| * | Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-1612-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Fix warning about unused function result in tst_qnetworkproxyfactory.Friedemann Kleint2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I1f996c208e05e456d374726c91a5f52ed64f784c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Fix warnings about overloaded virtuals in tests (CLANG).Friedemann Kleint2013-03-121-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I2f96073c4aaf4b11221b98cc6c7031b253a3b45c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | Fix warnings about unused field variables (CLANG).Friedemann Kleint2013-03-061-1/+0
| | | | | | | | | | | | | | | Change-Id: I488ad18eb0389d1e9b8b695b7a02eca47bee687e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>