diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-05-05 12:53:17 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-05-05 13:01:26 (GMT) |
| commit | b5e0130ff16e908a0e77904f34fa9af93b837dcb (patch) | |
| tree | e726606321df08b627ab456cc5c3e70cf8570f52 /tests | |
| parent | cffec6c4fc1aed32ec9b3d9dd1f97105005385dc (diff) | |
| download | Qt-b5e0130ff16e908a0e77904f34fa9af93b837dcb.zip Qt-b5e0130ff16e908a0e77904f34fa9af93b837dcb.tar.gz Qt-b5e0130ff16e908a0e77904f34fa9af93b837dcb.tar.bz2 | |
Skip test on MacOS due to problems with corewlan plugin
Reviewed-by: Cristiano di Flora
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp index 3359533..c270eb8 100644 --- a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp +++ b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp @@ -350,10 +350,13 @@ public: // regression test for QTBUG-18795 void tst_QNetworkConfigurationManager::usedInThread() { +#if defined Q_OS_MAC && !defined (QT_NO_COREWLAN) + QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken", SkipAll); +#else QNCMTestThread thread; connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); thread.start(); - QTestEventLoop::instance().enterLoop(5); + QTestEventLoop::instance().enterLoop(100); //QTRY_VERIFY could take ~90 seconds to time out in the thread QVERIFY(thread.isFinished()); qDebug() << "prescan:" << thread.preScanConfigs.count(); qDebug() << "postscan:" << thread.configs.count(); @@ -366,6 +369,7 @@ void tst_QNetworkConfigurationManager::usedInThread() QList<QNetworkConfiguration> configs = manager.allConfigurations(); QCOMPARE(thread.configs, configs); QCOMPARE(thread.preScanConfigs, preScanConfigs); +#endif } QTEST_MAIN(tst_QNetworkConfigurationManager) |