diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 13:23:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 06:15:00 +0200 |
| commit | 253497b7446c7d723aa3bdd7152e25d6852f2604 (patch) | |
| tree | e91eb9fdb94aae121fa587ab5f54f3917a6c1d55 /tests/auto/networkselftest | |
| parent | 3f88da82b1bdf79fe4c89640838b0b69c8a89d8b (diff) | |
Avoid using QSKIP in lieu of compile-time checks
QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe. If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.
Task-number: QTQAINFRA-278
Change-Id: I582732e3dd657df834f9a98fd52d7ee368f2f29b
Reviewed-on: http://codereview.qt-project.org/5946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/networkselftest')
| -rw-r--r-- | tests/auto/networkselftest/tst_networkselftest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp index 82ea045732..033ee57cdd 100644 --- a/tests/auto/networkselftest/tst_networkselftest.cpp +++ b/tests/auto/networkselftest/tst_networkselftest.cpp @@ -81,7 +81,9 @@ private slots: void httpServerFiles(); void httpServerCGI_data(); void httpServerCGI(); +#ifndef QT_NO_OPENSSL void httpsServer(); +#endif void httpProxy(); void httpProxyBasicAuth(); void httpProxyNtlmAuth(); @@ -768,9 +770,9 @@ void tst_NetworkSelfTest::httpServerCGI() netChat(80, chat); } +#ifndef QT_NO_OPENSSL void tst_NetworkSelfTest::httpsServer() { -#ifndef QT_NO_OPENSSL netChat(443, QList<Chat>() << Chat::StartEncryption << Chat::send("GET / HTTP/1.0\r\n" @@ -781,10 +783,8 @@ void tst_NetworkSelfTest::httpsServer() << Chat::discardUntil(" ") << Chat::expect("200 ") << Chat::DiscardUntilDisconnect); -#else - QSKIP("SSL not enabled, cannot test", SkipAll); -#endif } +#endif void tst_NetworkSelfTest::httpProxy() { |