summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network-settings.h')
-rw-r--r--tests/auto/network-settings.h17
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()