autotests fixes
tests / package-smoke-linux (push) Skipped
tests / package-smoke-windows (push) Skipped
tests / macos (push) Successful in 1m22s
tests / linux (pull_request) Successful in 1m54s
tests / package-smoke-macos (push) Skipped
tests / linux (push) Successful in 2m43s
tests / windows (push) Successful in 4m13s
tests / windows (pull_request) Skipped
tests / macos (pull_request) Skipped
tests / package-smoke-linux (pull_request) Skipped
tests / package-smoke-windows (pull_request) Skipped
tests / package-smoke-macos (pull_request) Skipped

Signed-off-by: galeon <dertiellis@gmail.com>
This commit is contained in:
galeon committed 2026-11-01 21:07:03 +03:00
1 parent 6a2b596f32
commit 5635dcc558
11 files changed
+134 -52

No files matched your search

+43 -11
View File
@@ -201,12 +201,32 @@ void FakeInternet::unroute(const QString &pattern)
void FakeInternet::reset()
{
m_deferred.clear();
m_diagnostics.clear();
m_routes.clear();
m_requests.clear();
m_unmatched.clear();
m_fallback = FakeResponse::error(404, "fake internet: no route");
}
bool FakeInternet::releaseResponse(const QString &url)
{
for (qsizetype i = 0; i < m_deferred.size(); ++i) {
if (m_deferred.at(i).url == url) {
const auto pending = m_deferred.takeAt(i);
respond(pending.socket, pending.response, pending.keepAlive);
return true;
}
}
return false;
}
QString FakeInternet::diagnostics() const
{
return QStringLiteral("TLS backend: %1\nRequests: %2\n%3")
.arg(QSslSocket::activeBackend(), requestedUrls().join(u' '), m_diagnostics.join(u'\n'));
}
QList<FakeRequest> FakeInternet::requests() const
{
return m_requests;
@@ -366,9 +386,13 @@ void FakeInternet::dispatch(Connection *connection, FakeRequest request)
}
const bool keepAlive = request.header("connection").toLower() != "close";
QPointer<QTcpSocket> socket(connection->socket);
QPointer<QSslSocket> socket(connection->socket);
if (response.hang)
return;
if (response.deferred) {
m_deferred.append({url, socket, response, keepAlive});
return;
}
if (response.delayMs > 0) {
QTimer::singleShot(response.delayMs, this,
[this, socket, response, keepAlive] { respond(socket, response, keepAlive); });
@@ -378,7 +402,7 @@ void FakeInternet::dispatch(Connection *connection, FakeRequest request)
emit requestServed(url);
}
void FakeInternet::respond(QPointer<QTcpSocket> socket, const FakeResponse &response, bool keepAlive)
void FakeInternet::respond(QPointer<QSslSocket> socket, const FakeResponse &response, bool keepAlive)
{
if (!socket || socket->state() != QAbstractSocket::ConnectedState)
return;
@@ -397,20 +421,28 @@ void FakeInternet::respond(QPointer<QTcpSocket> socket, const FakeResponse &resp
head += close ? "Connection: close\r\n" : "Connection: keep-alive\r\n";
head += "\r\n";
socket->write(head);
if (response.truncateTo >= 0) {
socket->write(response.body.left(response.truncateTo));
socket->flush();
socket->disconnectFromHost();
// Schannel (Windows) на disconnectFromHost шлёт только TLS close_notify и держит
// TCP открытым, ожидая ответного close_notify, — клиент тогда висит до таймаута.
// Обрыв на то и обрыв: если сокет не закрылся сам, рвём соединение.
QTimer::singleShot(200, socket, [socket] {
if (socket && socket->state() != QAbstractSocket::UnconnectedState)
m_diagnostics << QStringLiteral("truncate: declared=%1, sent=%2")
.arg(response.body.size()).arg(response.body.left(response.truncateTo).size());
// Сначала отправляем TLS-записи с неполным телом, затем рвём TCP.
// disconnectFromHost() выполняет штатное завершение TLS, а здесь
// моделируется обрыв. Готовность определяется буферами, не задержкой.
connect(socket, &QSslSocket::encryptedBytesWritten, socket, [this, socket](qint64) {
QTimer::singleShot(0, socket, [this, socket] {
if (!socket || socket->state() != QAbstractSocket::ConnectedState)
return;
if (socket->bytesToWrite() || socket->encryptedBytesToWrite())
return;
m_diagnostics << QStringLiteral("truncate: TLS buffers drained, aborting TCP");
socket->abort();
m_diagnostics << QStringLiteral("truncate: state after abort=%1").arg(socket->state());
});
});
socket->write(head);
socket->write(response.body.left(response.truncateTo));
return;
}
socket->write(head);
socket->write(response.body);
if (close)
socket->disconnectFromHost();