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

Revert "Remote Linux: Rework device testing"

Browse Source 
This reverts commit 934c067ddf365c6f12b1e4a1e431f27610b32f7d,
because it breaks running remote Linux applications due to 
buggy refactoring of the remote ports gatherer.

Change-Id: I15fd8d4f3e76452a8c5c735316991bd00900444f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-12-21 20:14:42 +01:00
parent 3b67e5dd37
commit 79db165dcb
22 changed files with 705 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -35,99 +35,164 @@
#include "remotelinuxusedportsgatherer.h"
#include <utils/qtcassert.h>
#include <utils/ssh/sshremoteprocessrunner.h>
#include <utils/ssh/sshremoteprocess.h>
#include <utils/ssh/sshconnection.h>
#include <utils/ssh/sshconnectionmanager.h>
using namespace Utils;
namespace RemoteLinux {
namespace Internal {
namespace {
class LinuxDeviceTesterPrivate
enum State { Inactive, Connecting, RunningUname, TestingPorts };
} // anonymous namespace
class GenericLinuxDeviceTesterPrivate
{
public:
LinuxDeviceTesterPrivate()
{ }
GenericLinuxDeviceTesterPrivate() : state(Inactive) {}
QString headLine;
LinuxDeviceConfiguration::ConstPtr deviceConfiguration;
SshConnection::Ptr connection;
SshRemoteProcess::Ptr process;
RemoteLinuxUsedPortsGatherer portsGatherer;
State state;
};
} // namespace Internal
using namespace Internal;
LinuxDeviceTester::LinuxDeviceTester(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration,
const QString &headline, const QString &commandline) :
SimpleRunner(deviceConfiguration, commandline),
d(new LinuxDeviceTesterPrivate)
AbstractLinuxDeviceTester::AbstractLinuxDeviceTester(QObject *parent) : QObject(parent)
{
d->headLine = headline;
}
LinuxDeviceTester::~LinuxDeviceTester()
GenericLinuxDeviceTester::GenericLinuxDeviceTester(QObject *parent)
: AbstractLinuxDeviceTester(parent), d(new GenericLinuxDeviceTesterPrivate)
{
}
GenericLinuxDeviceTester::~GenericLinuxDeviceTester()
{
delete d;
}
QString LinuxDeviceTester::headLine() const
void GenericLinuxDeviceTester::testDevice(const LinuxDeviceConfiguration::ConstPtr &deviceConfiguration)
{
return d->headLine;
QTC_ASSERT(d->state == Inactive, return);
d->deviceConfiguration = deviceConfiguration;
d->connection = SshConnection::create(deviceConfiguration->sshParameters());
connect(d->connection.data(), SIGNAL(connected()), SLOT(handleConnected()));
connect(d->connection.data(), SIGNAL(error(Utils::SshError)),
SLOT(handleConnectionFailure()));
emit progressMessage(tr("Connecting to host..."));
d->state = Connecting;
d->connection->connectToHost();
}
int LinuxDeviceTester::processFinished(int exitStatus)
void GenericLinuxDeviceTester::stopTest()
{
return SimpleRunner::processFinished(exitStatus) == 0 ? TestSuccess : TestFailure;
QTC_ASSERT(d->state != Inactive, return);
switch (d->state) {
case Connecting:
d->connection->disconnectFromHost();
break;
case TestingPorts:
d->portsGatherer.stop();
break;
case RunningUname:
d->process->close();
break;
case Inactive:
break;
}
setFinished(TestFailure);
}
AuthenticationTester::AuthenticationTester(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration) :
LinuxDeviceTester(deviceConfiguration, tr("Checking authentication data..."),
QLatin1String("echo \"Success!\""))
SshConnection::Ptr GenericLinuxDeviceTester::connection() const
{
SshConnectionManager::instance().forceNewConnection(sshParameters());
return d->connection;
}
void AuthenticationTester::handleStdOutput(const QByteArray &data)
void GenericLinuxDeviceTester::handleConnected()
{
m_authenticationSucceded = data.contains("Success!");
LinuxDeviceTester::handleStdOutput(data);
QTC_ASSERT(d->state == Connecting, return);
d->process = d->connection->createRemoteProcess("uname -rsm");
connect(d->process.data(), SIGNAL(closed(int)), SLOT(handleProcessFinished(int)));
emit progressMessage("Checking kernel version...");
d->state = RunningUname;
d->process->start();
}
int AuthenticationTester::processFinished(int exitStatus)
void GenericLinuxDeviceTester::handleConnectionFailure()
{
return LinuxDeviceTester::processFinished(exitStatus) == TestSuccess
&& m_authenticationSucceded ? TestSuccess : TestCriticalFailure;
QTC_ASSERT(d->state != Inactive, return);
emit errorMessage(tr("SSH connection failure: %1\n").arg(d->connection->errorString()));
setFinished(TestFailure);
}
UsedPortsTester::UsedPortsTester(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration) :
LinuxDeviceTester(deviceConfiguration, tr("Checking for available ports..."), QString()),
gatherer(new RemoteLinuxUsedPortsGatherer(deviceConfiguration))
void GenericLinuxDeviceTester::handleProcessFinished(int exitStatus)
{
connect(gatherer, SIGNAL(aboutToStart()), this, SIGNAL(aboutToStart()));
connect(gatherer, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
connect(gatherer, SIGNAL(finished(int)), this, SIGNAL(finished(int)));
connect(gatherer, SIGNAL(progressMessage(QString)), this, SIGNAL(progressMessage(QString)));
connect(gatherer, SIGNAL(started()), this, SIGNAL(started()));
QTC_ASSERT(d->state == RunningUname, return);
if (exitStatus != SshRemoteProcess::ExitedNormally || d->process->exitCode() != 0) {
const QByteArray stderrOutput = d->process->readAllStandardError();
if (!stderrOutput.isEmpty())
emit errorMessage(tr("uname failed: %1\n").arg(QString::fromUtf8(stderrOutput)));
else
emit errorMessage(tr("uname failed.\n"));
} else {
emit progressMessage(QString::fromUtf8(d->process->readAllStandardOutput()));
}
connect(&d->portsGatherer, SIGNAL(error(QString)), SLOT(handlePortsGatheringError(QString)));
connect(&d->portsGatherer, SIGNAL(portListReady()), SLOT(handlePortListReady()));
emit progressMessage(tr("Checking if specified ports are available..."));
d->state = TestingPorts;
d->portsGatherer.start(d->connection, d->deviceConfiguration);
}
UsedPortsTester::~UsedPortsTester()
void GenericLinuxDeviceTester::handlePortsGatheringError(const QString &message)
{
delete gatherer;
QTC_ASSERT(d->state == TestingPorts, return);
emit errorMessage(tr("Error gathering ports: %1\n").arg(message));
setFinished(TestFailure);
}
QString UsedPortsTester::commandLine() const
void GenericLinuxDeviceTester::handlePortListReady()
{
return gatherer->commandLine();
QTC_ASSERT(d->state == TestingPorts, return);
if (d->portsGatherer.usedPorts().isEmpty()) {
emit progressMessage("All specified ports are available.\n");
} else {
QString portList;
foreach (const int port, d->portsGatherer.usedPorts())
portList += QString::number(port) + QLatin1String(", ");
portList.remove(portList.count() - 2, 2);
emit errorMessage(tr("The following specified ports are currently in use: %1\n")
.arg(portList));
}
setFinished(TestSuccess);
}
void UsedPortsTester::run()
void GenericLinuxDeviceTester::setFinished(TestResult result)
{
gatherer->run();
}
void UsedPortsTester::cancel()
{
gatherer->cancel();
d->state = Inactive;
disconnect(d->connection.data(), 0, this, 0);
disconnect(&d->portsGatherer, 0, this, 0);
emit finished(result);
}
} // namespace RemoteLinux