feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

testFileTransfer(): Add more checks

Browse Source 
Make the target path more nested.

Task-number: QTCREATORBUG-28151
Change-Id: Iae0660294d873e82e3fef0cbf2411f7c22ef526f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-09 14:18:02 +02:00
parent e15d834601
commit f9522051f7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/filesystemaccess_test.cpp
View File

@@ -241,7 +241,7 @@ void FileSystemAccessTest::testFileTransfer()
QVERIFY2(dirForFilesToDownload.isValid(), qPrintable(dirForFilesToDownload.errorString())); QVERIFY2(dirForFilesToDownload.isValid(), qPrintable(dirForFilesToDownload.errorString()));
QVERIFY2(dir2ForFilesToDownload.isValid(), qPrintable(dirForFilesToDownload.errorString())); QVERIFY2(dir2ForFilesToDownload.isValid(), qPrintable(dirForFilesToDownload.errorString()));
static const auto getRemoteFilePath = [this](const QString &localFileName) { static const auto getRemoteFilePath = [this](const QString &localFileName) {
return m_device->filePath(QString("/tmp/").append(localFileName).append(".upload")); return m_device->filePath(QString("/tmp/foo/bar/").append(localFileName).append(".upload"));
}; };
FilesToTransfer filesToUpload; FilesToTransfer filesToUpload;
std::srand(QDateTime::currentDateTime().toSecsSinceEpoch()); std::srand(QDateTime::currentDateTime().toSecsSinceEpoch());
@@ -277,11 +277,11 @@ void FileSystemAccessTest::testFileTransfer()
getRemoteFilePath(bigFileName)}; getRemoteFilePath(bigFileName)};
fileTransfer.setFilesToTransfer(filesToUpload); fileTransfer.setFilesToTransfer(filesToUpload);
QString jobError; ProcessResultData result;
QEventLoop loop; QEventLoop loop;
connect(&fileTransfer, &FileTransfer::done, [&jobError, &loop] connect(&fileTransfer, &FileTransfer::done, [&result, &loop]
(const ProcessResultData &resultData) { (const ProcessResultData &resultData) {
jobError = resultData.m_errorString; result = resultData;
loop.quit(); loop.quit();
}); });
QTimer timer; QTimer timer;
@@ -293,7 +293,10 @@ void FileSystemAccessTest::testFileTransfer()
loop.exec(); loop.exec();
QVERIFY(timer.isActive()); QVERIFY(timer.isActive());
timer.stop(); timer.stop();
QVERIFY2(jobError.isEmpty(), qPrintable(jobError)); QCOMPARE(result.m_exitStatus, QProcess::NormalExit);
QVERIFY2(result.m_errorString.isEmpty(), qPrintable(result.m_errorString));
QCOMPARE(result.m_exitCode, 0);
QCOMPARE(result.m_error, QProcess::UnknownError);
} }
} // Internal } // Internal