diff options
| author | aavit <qt-info@nokia.com> | 2011-04-11 13:34:06 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-05-03 11:30:56 (GMT) |
| commit | 9d75ff6fa8f8844ff6599b68618821cd8c501757 (patch) | |
| tree | e52720c203f08c242b198ce1ae09ec72e7d2e737 | |
| parent | 5a834d7141cc7d29d022911ccec16e628d94acf1 (diff) | |
| download | Qt-9d75ff6fa8f8844ff6599b68618821cd8c501757.zip Qt-9d75ff6fa8f8844ff6599b68618821cd8c501757.tar.gz Qt-9d75ff6fa8f8844ff6599b68618821cd8c501757.tar.bz2 | |
Improve error reporting on failure to connect to baseline server
| -rw-r--r-- | tests/arthur/baselineserver/src/baselineserver.cpp | 1 | ||||
| -rw-r--r-- | tests/arthur/common/baselineprotocol.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp index 0c0871a..c22d1f8 100644 --- a/tests/arthur/baselineserver/src/baselineserver.cpp +++ b/tests/arthur/baselineserver/src/baselineserver.cpp @@ -162,6 +162,7 @@ bool BaselineHandler::establishConnection() { if (!proto.acceptConnection(&plat)) { qWarning() << runId << logtime() << "Accepting new connection from" << proto.socket.peerAddress().toString() << "failed." << proto.errorMessage(); + proto.sendBlock(BaselineProtocol::Abort, proto.errorMessage().toLatin1()); // In case the client can hear us, tell it what's wrong. proto.socket.disconnectFromHost(); return false; } diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp index 88cea36..d5e533a 100644 --- a/tests/arthur/common/baselineprotocol.cpp +++ b/tests/arthur/common/baselineprotocol.cpp @@ -374,7 +374,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun) Command cmd = UnknownError; if (!receiveBlock(&cmd, &block)) { - errMsg += QLS("Failed to get response from server."); + errMsg.prepend(QLS("Failed to get response from server. ")); return false; } |