summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qftp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/access/qftp')
-rw-r--r--tests/auto/network/access/qftp/BLACKLIST4
-rw-r--r--tests/auto/network/access/qftp/tst_qftp.cpp5
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/network/access/qftp/BLACKLIST b/tests/auto/network/access/qftp/BLACKLIST
index 92ad1aee8f..96d9274653 100644
--- a/tests/auto/network/access/qftp/BLACKLIST
+++ b/tests/auto/network/access/qftp/BLACKLIST
@@ -1,14 +1,10 @@
# QTBUG-15111
[activeMode:WithoutProxy]
-opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
-osx-10.10
[activeMode:WithoutProxyWithSession]
-opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
-osx-10.10
[list:epsvNotSupported]
*
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index b58e9bf558..1620c2ade6 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -254,6 +254,8 @@ void tst_QFtp::init()
} else {
networkSessionExplicit.clear();
}
+#else
+ Q_UNUSED(setSession);
#endif
delete ftp;
@@ -282,8 +284,7 @@ void tst_QFtp::init()
inFileDirExistsFunction = false;
- srand(time(0));
- uniqueExtension = QString::number((quintptr)this) + QString::number(rand())
+ uniqueExtension = QString::number((quintptr)this) + QString::number(QRandomGenerator::global()->generate())
+ QString::number((qulonglong)time(0));
}