diff --git a/tools/auto-tester/src/TestRunner.cpp b/tools/auto-tester/src/TestRunner.cpp index 06bb5aec9b..b598b6e5dc 100644 --- a/tools/auto-tester/src/TestRunner.cpp +++ b/tools/auto-tester/src/TestRunner.cpp @@ -41,6 +41,8 @@ void TestRunner::installerDownloadComplete() { startLocalServerProcesses(); runInterfaceWithTestScript(); + evaluateResults(); + killProcesses(); restoreHighFidelityAppDataFolder(); } @@ -134,14 +136,18 @@ void TestRunner::startLocalServerProcesses() { void TestRunner::runInterfaceWithTestScript() { QDir::setCurrent(_tempFolder); - QString branch = autoTester->getSelectedBranch(); - QString user = autoTester->getSelectedUser(); + _branch = autoTester->getSelectedBranch(); + _user = autoTester->getSelectedUser(); #ifdef Q_OS_WIN - QString commandLine = "interface.exe --url hifi://localhost --testScript https://raw.githubusercontent.com/" + user + - "/hifi_tests/" + branch + "/tests/testRecursive.js quitWhenFinished --testResultsLocation " + + QString commandLine = "interface.exe --url hifi://localhost --testScript https://raw.githubusercontent.com/" + _user + + "/hifi_tests/" + _branch + "/tests/testRecursive.js quitWhenFinished --testResultsLocation " + _snapshotFolder; system(commandLine.toStdString().c_str()); #endif } + +void TestRunner::evaluateResults() { + autoTester->runFromCommandLine(_snapshotFolder, _branch, _user); +} diff --git a/tools/auto-tester/src/TestRunner.h b/tools/auto-tester/src/TestRunner.h index 4d95086936..e9214b8cb7 100644 --- a/tools/auto-tester/src/TestRunner.h +++ b/tools/auto-tester/src/TestRunner.h @@ -16,7 +16,6 @@ #include #include "Downloader.h" -#include "ui/BusyWindow.h" class TestRunner : public QObject { Q_OBJECT @@ -35,6 +34,7 @@ public: void killProcessByName(QString processName); void startLocalServerProcesses(); void runInterfaceWithTestScript(); + void evaluateResults(); private: QDir _appDataFolder; @@ -51,7 +51,8 @@ private: const QString INSTALLER_URL{ "http://builds.highfidelity.com/HighFidelity-Beta-latest-dev.exe" }; const QString INSTALLER_FILENAME{ "HighFidelity-Beta-latest-dev.exe" }; - BusyWindow _busyWindow; + QString _branch; + QString _user; }; #endif // hifi_testRunner_h \ No newline at end of file