From 802cedf1bcd8afb7fc0562004f3cee21b15a8518 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Thu, 24 May 2018 13:29:02 -0700
Subject: [PATCH] Removed messages in non-interactive mode.

---
 tools/auto-tester/src/Test.cpp | 6 +++---
 tools/auto-tester/src/Test.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 11c5428c26..23d097b855 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -71,7 +71,7 @@ bool Test::compareImageLists(bool isInteractiveMode, QProgressBar* progressBar)
         QImage resultImage(resultImagesFullFilenames[i]);
         QImage expectedImage(expectedImagesFullFilenames[i]);
 
-        if (resultImage.width() != expectedImage.width() || resultImage.height() != expectedImage.height()) {
+        if (isInteractiveMode && (resultImage.width() != expectedImage.width() || resultImage.height() != expectedImage.height())) {
             QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Images are not the same size");
             exit(-1);
         }
@@ -131,7 +131,7 @@ void Test::appendTestResultsToFile(const QString& testResultsFolderPath, TestFai
         exit(-1);
     }
 
-    QString failureFolderPath { testResultsFolderPath + "/" + "Failure_" + QString::number(index) };
+    QString failureFolderPath { testResultsFolderPath + "/" + "Failure_" + QString::number(index) + "--" + testFailure._actualImageFilename.left(testFailure._actualImageFilename.length() - 4) };
     if (!QDir().mkdir(failureFolderPath)) {
         QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Failed to create folder " + failureFolderPath);
         exit(-1);
@@ -248,7 +248,7 @@ void Test::startTestsEvaluation(const QString& testFolder) {
 void Test::finishTestsEvaluation(bool isRunningFromCommandline, bool interactiveMode, QProgressBar* progressBar) {
     bool success = compareImageLists((!isRunningFromCommandline && interactiveMode), progressBar);
     
-    if (!isRunningFromCommandline) {
+    if (interactiveMode && !isRunningFromCommandline) {
         if (success) {
             QMessageBox::information(0, "Success", "All images are as expected");
         } else {
diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h
index 78c5dfb14c..32564035e7 100644
--- a/tools/auto-tester/src/Test.h
+++ b/tools/auto-tester/src/Test.h
@@ -102,9 +102,9 @@ private:
     QStringList resultImagesFullFilenames;
 
     // Used for accessing GitHub
-    const QString GIT_HUB_USER{ "NissimHadar" };
+    const QString GIT_HUB_USER{ "highfidelity" };
     const QString GIT_HUB_REPOSITORY{ "hifi_tests" };
-    const QString GIT_HUB_BRANCH{ "newAvatar" };
+    const QString GIT_HUB_BRANCH{ "master" };
 
     const QString DATETIME_FORMAT{ "yyyy-MM-dd_hh-mm-ss" };