diff options
| author | aavit <qt-info@nokia.com> | 2010-12-16 09:57:06 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-12-16 09:57:06 (GMT) |
| commit | ba2f8a1f7da6b40a095cad43e4b737dc1306b0cc (patch) | |
| tree | 7325a39c62d7cf66537f39be5c0037f4a3cd646d | |
| parent | 017a5cfc6462317e6cca0f04a8339e2575bb9130 (diff) | |
| download | Qt-ba2f8a1f7da6b40a095cad43e4b737dc1306b0cc.zip Qt-ba2f8a1f7da6b40a095cad43e4b737dc1306b0cc.tar.gz Qt-ba2f8a1f7da6b40a095cad43e4b737dc1306b0cc.tar.bz2 | |
Need not keep client waiting until server has saved
| -rw-r--r-- | tests/arthur/baselineserver/src/baselineserver.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp index 6351dff..f59600f 100644 --- a/tests/arthur/baselineserver/src/baselineserver.cpp +++ b/tests/arthur/baselineserver/src/baselineserver.cpp @@ -267,6 +267,13 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline) QString prefix = pathForItem(item, isBaseline); qDebug() << runId << logtime() << "Received" << (isBaseline ? "baseline" : "mismatched") << "image for:" << item.itemName << "Storing in" << prefix; + QString msg; + if (isBaseline) + msg = QLS("New baseline image stored: ") + pathForItem(item, true, true) + QLS(FileFormat); + else + msg = BaselineServer::baseUrl() + report.filePath(); + proto.sendBlock(BaselineProtocol::Ack, msg.toLatin1()); + QString dir = prefix.section(QLC('/'), 0, -2); QDir cwd; if (!cwd.exists(dir)) @@ -282,14 +289,6 @@ void BaselineHandler::storeImage(const QByteArray &itemBlock, bool isBaseline) if (!isBaseline) report.addMismatch(item); - - QString msg; - if (isBaseline) - msg = QLS("New baseline image stored: ") + pathForItem(item, true, true) + QLS(FileFormat); - else - msg = BaselineServer::baseUrl() + report.filePath(); - - proto.sendBlock(BaselineProtocol::Ack, msg.toLatin1()); } |