ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix version check to allow automatic package version bumping

pull/135/head
Michael Zanetti 2014-06-14 18:01:19 +02:00
parent bbfa2ff1d9
commit eec2461622
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/versioning/testversioning.cpp
View File

@ -68,14 +68,18 @@ void TestVersioning::apiChangeBumpsVersion()
QByteArray oldVersion = oldApiFile.readLine().trimmed();
QByteArray oldApi = oldApiFile.readAll();
qDebug() << "version" << oldVersion << newVersion;
QString newVersionStripped = newVersion;
newVersionStripped = newVersionStripped.remove(QRegExp("\\+[0-9\\.~a-f]*"));
if (oldVersion == newVersion && oldApi == newApi) {
qDebug() << "JSON API version:" << oldVersion;
qDebug() << "Binary version:" << newVersion << "(" + newVersionStripped + ")";
if (oldVersion == newVersionStripped && oldApi == newApi) {
// All fine. no changes
return;
}
if (oldVersion == newVersion && oldApi != newApi) {
if (oldVersion == newVersionStripped && oldApi != newApi) {
QVERIFY2(false, "JSONRPC API has changed but version is still the same. You need to bump the API version.");
}
@ -94,7 +98,7 @@ void TestVersioning::apiChangeBumpsVersion()
p.waitForFinished();
qDebug() << p.readAll();
if (oldVersion != newVersion && oldApi == newApi) {
if (oldVersion != newVersionStripped && oldApi == newApi) {
QVERIFY2(false, QString("Version has changed. Update %1.").arg(oldFilePath).toLatin1().data());
} else {
QVERIFY2(false, QString("JSONRPC API has changed. Update %1.").arg(oldFilePath).toLatin1().data());