From b864496238f76a9af40d977da325da874ad2ee7a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 1 Feb 2022 12:13:56 +0100 Subject: [PATCH] Manual tests: Adapt to upstream changes Change-Id: If7a3cfe94f96c64efbd43636ab0d054f9dbce32c Reviewed-by: Christian Kandeler --- tests/manual/ssh/shell/argumentscollector.cpp | 3 ++- tests/manual/ssh/shell/shell.cpp | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/manual/ssh/shell/argumentscollector.cpp b/tests/manual/ssh/shell/argumentscollector.cpp index 1a34b4e53df..e9e7e61888b 100644 --- a/tests/manual/ssh/shell/argumentscollector.cpp +++ b/tests/manual/ssh/shell/argumentscollector.cpp @@ -58,7 +58,8 @@ SshConnectionParameters ArgumentsCollector::collect(bool &success) const } else if (checkAndSetIntArg(pos, port, portGiven, "-p") || checkAndSetIntArg(pos, parameters.timeout, timeoutGiven, "-t")) { continue; - } else if (checkAndSetStringArg(pos, parameters.privateKeyFile, "-k")) { + } else if (checkAndSetStringArg(pos, str, "-k")) { + parameters.privateKeyFile = Utils::FilePath::fromString(str); parameters.authenticationType = SshConnectionParameters::AuthenticationTypeSpecificKey; authTypeGiven = true; diff --git a/tests/manual/ssh/shell/shell.cpp b/tests/manual/ssh/shell/shell.cpp index 85f639faf0e..a588a17c908 100644 --- a/tests/manual/ssh/shell/shell.cpp +++ b/tests/manual/ssh/shell/shell.cpp @@ -42,7 +42,6 @@ Shell::Shell(const SshConnectionParameters ¶meters, QObject *parent) m_stdin(new QFile(this)) { connect(m_connection, &SshConnection::connected, this, &Shell::handleConnected); - connect(m_connection, &SshConnection::dataAvailable, this, &Shell::handleShellMessage); connect(m_connection, &SshConnection::errorOccurred, this, &Shell::handleConnectionError); } @@ -68,11 +67,6 @@ void Shell::handleConnectionError() QCoreApplication::exit(EXIT_FAILURE); } -void Shell::handleShellMessage(const QString &message) -{ - std::cout << qPrintable(message); -} - void Shell::handleConnected() { m_shell = m_connection->createRemoteShell();