Update tests and docker scripts to reflect the provisioning updates

The californium docker container is updated, and now provides a
different binary to run.

This patch adjusts the tests and docker script:
* update the docker script to call the proper binary
* update the number of resources exposed by the californium server
* update the expected returned tokens to be uppercase

Task-number: QTBUG-114798
Pick-to: 6.6 6.5
Change-Id: I733793cc472769e433144a08b8f02f0120f6f29b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
This commit is contained in:
Ivan Solovev 2023-07-20 19:01:35 +02:00
parent e90b39053b
commit 6ffcaefbe1
2 changed files with 6 additions and 5 deletions

View File

@ -545,7 +545,8 @@ void tst_QCoapClient::multipleRequests()
QCOMPARE(replies[i]->responseCode(), QtCoap::ResponseCode::Content);
QByteArray replyData = replies[i]->readAll();
const auto token = "token" + QByteArray::number(i);
QVERIFY(replyData.contains(token.toHex()));
// The californium server now returns the hex token in uppercase
QVERIFY(replyData.contains(token.toHex().toUpper()));
}
}
@ -835,14 +836,14 @@ void tst_QCoapClient::discover_data()
QTest::addColumn<int>("resourceNumber");
QTest::addColumn<QtCoap::SecurityMode>("security");
// Californium test server exposes 29 resources
// Californium test server exposes 31 resources
QTest::newRow("discover")
<< QUrl(testServerHost())
<< 29
<< 31
<< QtCoap::SecurityMode::NoSecurity;
QTest::newRow("discover_secure")
<< QUrl(testServerHost())
<< 29
<< 31
<< QtCoap::SecurityMode::PreSharedKey;
}

View File

@ -4,4 +4,4 @@
set -ex
java -jar /root/src/californium/demo-apps/run/cf-plugtest-server-1.1.0-SNAPSHOT.jar &
java -jar /root/src/californium/demo-apps/run/cf-plugtest-server-3.8.0.jar &