Corrected bug in zip folder name.

This commit is contained in:
NissimHadar 2019-02-13 15:13:55 -08:00
parent 8a07e2b31a
commit 77b679606f
2 changed files with 13 additions and 8 deletions

View file

@ -554,7 +554,7 @@ void TestRunnerDesktop::evaluateResults() {
nitpick->startTestsEvaluation(false, true, _snapshotFolder, _branch, _user); nitpick->startTestsEvaluation(false, true, _snapshotFolder, _branch, _user);
} }
void TestRunnerDesktop::automaticTestRunEvaluationComplete(QString zippedFolder, int numberOfFailures) { void TestRunnerDesktop::automaticTestRunEvaluationComplete(const QString& zippedFolder, int numberOfFailures) {
addBuildNumberToResults(zippedFolder); addBuildNumberToResults(zippedFolder);
restoreHighFidelityAppDataFolder(); restoreHighFidelityAppDataFolder();
@ -580,14 +580,19 @@ void TestRunnerDesktop::automaticTestRunEvaluationComplete(QString zippedFolder,
_runNow->setEnabled(true); _runNow->setEnabled(true);
} }
void TestRunnerDesktop::addBuildNumberToResults(QString zippedFolderName) { void TestRunnerDesktop::addBuildNumberToResults(const QString& zippedFolderName) {
QString augmentedFilename; QString augmentedFilename { zippedFolderName };
if (!_runLatest->isChecked()) { if (!_runLatest->isChecked()) {
augmentedFilename = zippedFolderName.replace("local", getPRNumberFromURL(_url->text())); augmentedFilename.replace("local", getPRNumberFromURL(_url->text()));
} else { } else {
augmentedFilename = zippedFolderName.replace("local", _buildInformation.build); augmentedFilename.replace("local", _buildInformation.build);
}
if (!QFile::rename(zippedFolderName, augmentedFilename)) {
QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Could not rename '" + zippedFolderName + "' to '" + augmentedFilename);
exit(-1);
} }
QFile::rename(zippedFolderName, augmentedFilename);
} }
void TestRunnerDesktop::restoreHighFidelityAppDataFolder() { void TestRunnerDesktop::restoreHighFidelityAppDataFolder() {

View file

@ -61,8 +61,8 @@ public:
void runInterfaceWithTestScript(); void runInterfaceWithTestScript();
void evaluateResults(); void evaluateResults();
void automaticTestRunEvaluationComplete(QString zippedFolderName, int numberOfFailures); void automaticTestRunEvaluationComplete(const QString& zippedFolderName, int numberOfFailures);
void addBuildNumberToResults(QString zippedFolderName); void addBuildNumberToResults(const QString& zippedFolderName);
void copyFolder(const QString& source, const QString& destination); void copyFolder(const QString& source, const QString& destination);