diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2013-08-27 14:58:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-28 12:45:34 +0200 |
| commit | 627a394fb7ba1507bd028f81522244e7e085ef8d (patch) | |
| tree | 9b4def8b29901be957622f08dab5b5633d89cf1d /tests/auto/network-settings.h | |
| parent | 198d2f6d3e1f622e1f168ff7e6aea7d1f05b80ed (diff) | |
network test settings: support newer FTP server versions
... which are used by the new test server image.
Change-Id: I72ffa73d3e254b278fb9063d32b633b156bd3ec0
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto/network-settings.h')
| -rw-r--r-- | tests/auto/network-settings.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 2ffb89241c..ad51df9090 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -103,20 +103,9 @@ public: static bool compareReplyFtp(QByteArray const& actual) { - QList<QByteArray> expected; - - // A few different vsFTPd versions. - // Feel free to add more as needed - expected << QByteArray( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ); - expected << QByteArray( "220 (vsFTPd 2.2.2)\r\n221 Goodbye.\r\n" ); - - Q_FOREACH (QByteArray const& ba, expected) { - if (ba == actual) { - return true; - } - } - - return false; + // output would be e.g. "220 (vsFTPd 2.3.5)\r\n221 Goodbye.\r\n" + QRegExp ftpVersion(QStringLiteral("220 \\(vsFTPd \\d+\\.\\d+.\\d+\\)\\r\\n221 Goodbye.\\r\\n")); + return ftpVersion.exactMatch(actual); } static bool hasIPv6() |