whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Peter Hartmann 2013-08-27 14:58:49 +02:00 committed by The Qt Project
parent 198d2f6d3e
commit 627a394fb7
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/network-settings.h
View File

@ -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()