Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SyncthingTestInstance

This commit is contained in:
Martchus 2021-06-17 21:01:06 +02:00
parent ae99dd284c
commit f7b977d919
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
testhelper/syncthingtestinstance.cpp
View File

@ -101,21 +101,16 @@ void SyncthingTestInstance::stop()
} }
if (m_syncthingProcess.isOpen()) { if (m_syncthingProcess.isOpen()) {
cerr << "\n - Syncthing terminated with exit code " << m_syncthingProcess.exitCode() << ".\n"; cerr << "\n - Syncthing terminated with exit code " << m_syncthingProcess.exitCode() << ".\n";
/* const auto output = m_syncthingProcess.readAll();
const auto stdOut(m_syncthingProcess.readAllStandardOutput()); if (!output.isEmpty()) {
if (!stdOut.isEmpty()) { cerr << "\n - Syncthing output (merged stdout/stderr) during the testrun:\n"
cerr << "\n - Syncthing stdout during the testrun:\n" << stdOut.data(); << std::string_view(output.data(), static_cast<std::string_view::size_type>(output.size()));
} }
const auto stdErr(m_syncthingProcess.readAllStandardError()); if (!output.isEmpty()) {
if (!stdErr.isEmpty()) { cerr << "\n - Syncthing (re)started: " << output.count("INFO: Starting syncthing") << " times";
cerr << "\n - Syncthing stderr during the testrun:\n" << stdErr.data(); cerr << "\n - Syncthing exited: " << output.count("INFO: Syncthing exited: exit status") << " times";
cerr << "\n - Syncthing panicked: " << output.count("WARNING: Panic detected") << " times";
} }
if (!stdOut.isEmpty()) {
cerr << "\n - Syncthing (re)started: " << stdOut.count("INFO: Starting syncthing") << " times";
cerr << "\n - Syncthing exited: " << stdOut.count("INFO: Syncthing exited: exit status") << " times";
cerr << "\n - Syncthing panicked: " << stdOut.count("WARNING: Panic detected") << " times";
}
*/
} }
} }
@ -128,7 +123,7 @@ void SyncthingTestInstance::setInterleavedOutputEnabled(bool interleavedOutputEn
return; return;
} }
m_interleavedOutput = interleavedOutputEnabled; m_interleavedOutput = interleavedOutputEnabled;
//m_syncthingProcess.setProcessChannelMode(interleavedOutputEnabled ? QProcess::ForwardedChannels : QProcess::SeparateChannels); m_syncthingProcess.setProcessChannelMode(interleavedOutputEnabled ? QProcess::ForwardedChannels : QProcess::MergedChannels);
} }
/*! /*!