Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for adb and python when needed.

Browse source 
Look for adb and python in PATH.
This commit is contained in:
NissimHadar 2019-02-12 09:06:04 -08:00
parent 54e36f0825
commit 6225d97357
14 changed files with 189 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tools/nitpick/src/AdbInterface.cpp Normal file
View file

@ -0,0 +1,38 @@
//
// AdbInterface.cpp
//
// Created by Nissim Hadar on Feb 11, 2019.
// Copyright 2013 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "AdbInterface.h"
#include <PathUtils.h>
#include <QFile>
#include <QMessageBox>
QString AdbInterface::getAdbCommand() {
#ifdef Q_OS_WIN
if (_adbCommand.isNull()) {
QString adbPath = PathUtils::getPathToExecutable("adb.exe");
if (!adbPath.isNull()) {
_adbCommand = adbPath + _adbExe;
} else {
QMessageBox::critical(0, "python.exe not found",
"Please verify that pyton.exe is in the PATH");
exit(-1);
}
}
#elif defined Q_OS_MAC
_adbCommand = "/usr/local/bin/adb";
if (!QFile::exists(_adbCommand)) {
QMessageBox::critical(0, "adb not found",
"adb not found at " + _adbCommand);
exit(-1);
}
#endif
return _adbCommand;
}

30
tools/nitpick/src/AdbInterface.h Normal file
View file

@ -0,0 +1,30 @@
//
// AdbInterface.h
//
// Created by Nissim Hadar on Feb 11, 2019.
// Copyright 2013 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_AdbInterface_h
#define hifi_AdbInterface_h
#include <QString>
class AdbInterface {
public:
QString getAdbCommand();
private:
#ifdef Q_OS_WIN
const QString _adbExe{ "adb.exe" };
#else
// Both Mac and Linux use "python"
const QString _adbExe{ "adb" };
#endif
QString _adbCommand;
};
#endif // hifi_AdbInterface_h

2
tools/nitpick/src/Nitpick.cpp
View file

@ -40,7 +40,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
_ui.plainTextEdit->setReadOnly(true);
setWindowTitle("Nitpick - v2.1.0");
setWindowTitle("Nitpick - v2.1.1");
}
Nitpick::~Nitpick() {

4
tools/nitpick/src/Nitpick.h
View file

@ -21,8 +21,6 @@
#include "TestRunnerDesktop.h"
#include "TestRunnerMobile.h"
#include "AWSInterface.h"
class Nitpick : public QMainWindow {
Q_OBJECT
@ -112,8 +110,6 @@ private:
TestRunnerDesktop* _testRunnerDesktop{ nullptr };
TestRunnerMobile* _testRunnerMobile{ nullptr };
AWSInterface _awsInterface;
std::vector<Downloader*> _downloaders;
// local storage for parameters - folder to store downloaded files in, and a list of their names

31
tools/nitpick/src/PathUtils.cpp Normal file
View file

@ -0,0 +1,31 @@
//
// PathUtils.h
//
// Created by Nissim Hadar on 11 Feb 2019.
// Copyright 2013 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "PathUtils.h"
#include <QFile>
#include <QProcess>
#include <QStringList>
QString PathUtils::getPathToExecutable(const QString& executableName) {
QString path = QProcessEnvironment::systemEnvironment().value("PATH");
QStringList pathLocations = path.replace('\\', '/').split(';');
foreach (QString pathLocation, pathLocations) {
if (pathLocation[pathLocation.length() - 1] != '/') {
pathLocation += '/';
}
if (QFile::exists(pathLocation + executableName)) {
return pathLocation;
}
}
return QString();
}

20
tools/nitpick/src/PathUtils.h Normal file
View file

@ -0,0 +1,20 @@
//
// PathUtils.h
//
// Created by Nissim Hadar on 11 Feb 2019.
// Copyright 2013 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_PathUtils_h
#define hifi_PathUtils_h
#include <Qstring>
class PathUtils {
public:
static QString getPathToExecutable(const QString& executableName);
};
#endif

25
tools/nitpick/src/PythonInterface.cpp
View file

@ -8,36 +8,31 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "PythonInterface.h"
#include <PathUtils.h>
#include <QFile>
#include <QMessageBox>
#include <QProcess>
PythonInterface::PythonInterface() {
QString PythonInterface::getPythonCommand() {
#ifdef Q_OS_WIN
if (QProcessEnvironment::systemEnvironment().contains("PYTHON_PATH")) {
QString pythonPath = QProcessEnvironment::systemEnvironment().value("PYTHON_PATH");
if (!QFile::exists(pythonPath + "/" + _pythonExe)) {
QMessageBox::critical(0, _pythonExe, QString("Python executable not found in ") + pythonPath);
if (_pythonCommand.isNull()) {
QString pythonPath = PathUtils::getPathToExecutable("python.exe");
if (!pythonPath.isNull()) {
_pythonCommand = pythonPath + _pythonExe;
} else {
QMessageBox::critical(0, "python.exe not found",
"Please verify that pyton.exe is in the PATH");
exit(-1);
}
_pythonCommand = pythonPath + "/" + _pythonExe;
} else {
QMessageBox::critical(0, "PYTHON_PATH not defined",
"Please set PYTHON_PATH to directory containing the Python executable");
exit(-1);
}
#elif defined Q_OS_MAC
_pythonCommand = "/usr/local/bin/python3";
if (!QFile::exists(_pythonCommand)) {
QMessageBox::critical(0, "python not found",
"python3 not found at " + _pythonCommand);
"python3 not found at " + _pythonCommand);
exit(-1);
}
#endif
}
QString PythonInterface::getPythonCommand() {
return _pythonCommand;
}

2
tools/nitpick/src/PythonInterface.h
View file

@ -14,8 +14,6 @@
class PythonInterface {
public:
PythonInterface();
QString getPythonCommand();
private:

30
tools/nitpick/src/Test.cpp
View file

@ -24,7 +24,7 @@ extern Nitpick* nitpick;
#include <math.h>
Test::Test(QProgressBar* progressBar, QCheckBox* checkBoxInteractiveMode) {
Test::Test(QProgressBar* progressBar, QCheckBox* checkBoxInteractiveMode) : _awsInterface(NULL) {
_progressBar = progressBar;
_checkBoxInteractiveMode = checkBoxInteractiveMode;
@ -966,11 +966,15 @@ void Test::createTestRailTestCases() {
return;
}
if (!_testRailInterface) {
_testRailInterface = new TestRailInterface;
}
if (_testRailCreateMode == PYTHON) {
_testRailInterface.createTestSuitePython(_testDirectory, outputDirectory, nitpick->getSelectedUser(),
_testRailInterface->createTestSuitePython(_testDirectory, outputDirectory, nitpick->getSelectedUser(),
nitpick->getSelectedBranch());
} else {
_testRailInterface.createTestSuiteXML(_testDirectory, outputDirectory, nitpick->getSelectedUser(),
_testRailInterface->createTestSuiteXML(_testDirectory, outputDirectory, nitpick->getSelectedUser(),
nitpick->getSelectedBranch());
}
}
@ -983,7 +987,12 @@ void Test::createTestRailRun() {
return;
}
_testRailInterface.createTestRailRun(outputDirectory);
if (!_testRailInterface) {
_testRailInterface = new TestRailInterface;
}
_testRailInterface->createTestRailRun(outputDirectory);
}
void Test::updateTestRailRunResult() {
@ -999,7 +1008,12 @@ void Test::updateTestRailRunResult() {
return;
}
_testRailInterface.updateTestRailRunResults(testResults, tempDirectory);
if (!_testRailInterface) {
_testRailInterface = new TestRailInterface;
}
_testRailInterface->updateTestRailRunResults(testResults, tempDirectory);
}
QStringList Test::createListOfAll_imagesInDirectory(const QString& imageFormat, const QString& pathToImageDirectory) {
@ -1088,5 +1102,9 @@ void Test::createWebPage(QCheckBox* updateAWSCheckBox, QLineEdit* urlLineEdit) {
return;
}
_awsInterface.createWebPageFromResults(testResults, workingDirectory, updateAWSCheckBox, urlLineEdit);
if (!_awsInterface) {
_awsInterface = new AWSInterface;
}
_awsInterface->createWebPageFromResults(testResults, workingDirectory, updateAWSCheckBox, urlLineEdit);
}

4
tools/nitpick/src/Test.h
View file

@ -159,10 +159,10 @@ private:
bool _exitWhenComplete{ false };
TestRailInterface _testRailInterface;
TestRailInterface* _testRailInterface;
TestRailCreateMode _testRailCreateMode { PYTHON };
AWSInterface _awsInterface;
AWSInterface* _awsInterface;
};
#endif // hifi_test_h

2
tools/nitpick/src/TestRailInterface.cpp
View file

@ -20,7 +20,7 @@
#include <QMessageBox>
#include <QTextStream>
TestRailInterface::TestRailInterface() {
TestRailInterface::TestRailInterface() : _pythonInterface(NULL) {
_testRailTestCasesSelectorWindow.setURL("https://highfidelity.testrail.net");
_testRailTestCasesSelectorWindow.setUser("@highfidelity.io");

57
tools/nitpick/src/TestRunnerMobile.cpp
View file

@ -30,7 +30,7 @@ TestRunnerMobile::TestRunnerMobile(
QLabel* statusLabel,
QObject* parent
) : QObject(parent)
) : QObject(parent), _adbInterface(NULL)
{
_workingFolderLabel = workingFolderLabel;
_connectDeviceButton = connectDeviceButton;
@ -47,30 +47,6 @@ TestRunnerMobile::TestRunnerMobile(
folderLineEdit->setText("/sdcard/DCIM/TEST");
modelNames["SM_G955U1"] = "Samsung S8+ unlocked";
// Find ADB (Android Debugging Bridge)
#ifdef Q_OS_WIN
if (QProcessEnvironment::systemEnvironment().contains("ADB_PATH")) {
QString adbExePath = QProcessEnvironment::systemEnvironment().value("ADB_PATH") + "/platform-tools";
if (!QFile::exists(adbExePath + "/" + _adbExe)) {
QMessageBox::critical(0, _adbExe, QString("ADB executable not found in ") + adbExePath);
exit(-1);
}
_adbCommand = adbExePath + "/" + _adbExe;
} else {
QMessageBox::critical(0, "ADB_PATH not defined",
"Please set ADB_PATH to directory containing the `adb` executable");
exit(-1);
}
#elif defined Q_OS_MAC
_adbCommand = "/usr/local/bin/adb";
if (!QFile::exists(_adbCommand)) {
QMessageBox::critical(0, "adb not found",
"python3 not found at " + _adbCommand);
exit(-1);
}
#endif
}
TestRunnerMobile::~TestRunnerMobile() {
@ -84,8 +60,12 @@ void TestRunnerMobile::setWorkingFolderAndEnableControls() {
void TestRunnerMobile::connectDevice() {
#if defined Q_OS_WIN || defined Q_OS_MAC
if (!_adbInterface) {
_adbInterface = new AdbInterface();
}
QString devicesFullFilename{ _workingFolder + "/devices.txt" };
QString command = _adbCommand + " devices -l > " + devicesFullFilename;
QString command = _adbInterface->getAdbCommand() + " devices -l > " + devicesFullFilename;
system(command.toStdString().c_str());
if (!QFile::exists(devicesFullFilename)) {
@ -100,12 +80,13 @@ void TestRunnerMobile::connectDevice() {
QString line2 = devicesFile.readLine();
const QString DEVICE{ "device" };
if (line2.contains(DEVICE)) {
// Make sure only 1 device
if (line2.contains("unauthorized")) {
QMessageBox::critical(0, "Unauthorized device detected", "Please allow USB debug on device");
} else if (line2.contains(DEVICE)) {
// Make sure only 1 device
QString line3 = devicesFile.readLine();
if (line3.contains(DEVICE)) {
QMessageBox::critical(0, "Too many devices detected", "Tests will run only if a single device is attached");
} else {
// Line looks like this: 988a1b47335239434b device product:dream2qlteue model:SM_G955U1 device:dream2qlteue transport_id:2
QStringList tokens = line2.split(QRegExp("[\r\n\t ]+"));
@ -169,8 +150,12 @@ void TestRunnerMobile::downloadComplete() {
void TestRunnerMobile::installAPK() {
#if defined Q_OS_WIN || defined Q_OS_MAC
if (!_adbInterface) {
_adbInterface = new AdbInterface();
}
_statusLabel->setText("Installing");
QString command = _adbCommand + " install -r -d " + _workingFolder + "/" + _installerFilename + " >" + _workingFolder + "/installOutput.txt";
QString command = _adbInterface->getAdbCommand() + " install -r -d " + _workingFolder + "/" + _installerFilename + " >" + _workingFolder + "/installOutput.txt";
system(command.toStdString().c_str());
_statusLabel->setText("Installation complete");
_runInterfacePushbutton->setEnabled(true);
@ -179,8 +164,12 @@ void TestRunnerMobile::installAPK() {
void TestRunnerMobile::runInterface() {
#if defined Q_OS_WIN || defined Q_OS_MAC
if (!_adbInterface) {
_adbInterface = new AdbInterface();
}
_statusLabel->setText("Starting Interface");
QString command = _adbCommand + " shell monkey -p io.highfidelity.hifiinterface -v 1";
QString command = _adbInterface->getAdbCommand() + " shell monkey -p io.highfidelity.hifiinterface -v 1";
system(command.toStdString().c_str());
_statusLabel->setText("Interface started");
#endif
@ -188,8 +177,12 @@ void TestRunnerMobile::runInterface() {
void TestRunnerMobile::pullFolder() {
#if defined Q_OS_WIN || defined Q_OS_MAC
if (!_adbInterface) {
_adbInterface = new AdbInterface();
}
_statusLabel->setText("Pulling folder");
QString command = _adbCommand + " pull " + _folderLineEdit->text() + " " + _workingFolder + _installerFilename;
QString command = _adbInterface->getAdbCommand() + " pull " + _folderLineEdit->text() + " " + _workingFolder + _installerFilename;
system(command.toStdString().c_str());
_statusLabel->setText("Pull complete");
#endif

3
tools/nitpick/src/TestRunnerMobile.h
View file

@ -17,6 +17,7 @@
#include <QPushButton>
#include "TestRunner.h"
#include "AdbInterface.h"
class TestRunnerMobile : public QObject, public TestRunner {
Q_OBJECT
@ -70,5 +71,7 @@ private:
QString _adbCommand;
std::map<QString, QString> modelNames;
AdbInterface* _adbInterface;
};
#endif

8
tools/nitpick/ui/Nitpick.ui
View file

@ -686,8 +686,8 @@
<widget class="QLabel" name="workingFolderLabel_4">
<property name="geometry">
<rect>
<x>290</x>
<y>20</y>
<x>300</x>
<y>60</y>
<width>41</width>
<height>31</height>
</rect>
@ -699,8 +699,8 @@
<widget class="QLabel" name="statusLabelOnMobile">
<property name="geometry">
<rect>
<x>340</x>
<y>20</y>
<x>350</x>
<y>60</y>
<width>271</width>
<height>31</height>
</rect>