Merge lp:~aacid/system-image-client/mandatory_update_fix into lp:system-image-client

[Albert Astals Cid]

Fix updating to non final mandatory versions

E.g. you are in version 1, version 2 is mandatory and version 3 recommended, you should get an update to version 2

As discussed fix updating to non final mandatory versions

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/system-image-client-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/system-image-client-ci/./label=precise/62/console

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'systemimageclient.cpp'
--- systemimageclient.cpp	2012-07-23 07:34:59 +0000
+++ systemimageclient.cpp	2012-07-23 15:22:24 +0000
@@ -279,7 +279,7 @@
         if (m_desiredVersion != 0) {
             updateToDesiredVersion(entries);
         } else {
-            updateToNewestVersion(entries);
+            updateToNewestMandatoryVersion(entries);
         }
     }
 }
@@ -302,37 +302,37 @@
     }
 }
 
-void SystemImageClient::updateToNewestVersion(const QList<IndexEntry> &entries)
+void SystemImageClient::updateToNewestMandatoryVersion(const QList<IndexEntry> &entries)
 {
-    IndexEntry higherModelEntry;
+    IndexEntry higherMandatoryEntry;
     foreach(const IndexEntry& entry, entries) {
-        if (entry.models().contains(m_model)) {
-            if (higherModelEntry.models().isEmpty()) {
-                higherModelEntry = entry;
-            } else if (higherModelEntry.version() < entry.version()) {
-                higherModelEntry = entry;
+        if (entry.type() == IndexEntry::MandatoryUpdate && entry.models().contains(m_model)) {
+            if (higherMandatoryEntry.models().isEmpty()) {
+                higherMandatoryEntry = entry;
+            } else if (higherMandatoryEntry.version() < entry.version()) {
+                higherMandatoryEntry = entry;
             }
         }
     }
 
-    if (!higherModelEntry.models().isEmpty() && higherModelEntry.version() > m_currentImageVersion) {
-        switch (higherModelEntry.type()) {
-            case IndexEntry::MandatoryUpdate:
-                downloadAndInstallEntry(higherModelEntry);
-            break;
-
-            case IndexEntry::RecommendedUpdate:
-                // Inform whoever might be interested we have a new recommended update
-                Q_EMIT newRecommendedUpdate(higherModelEntry);
-                qApp->exit();
-            break;
-
-            case IndexEntry::NonRecommendedUpdate:
-                // Nothing
-                qApp->exit();
-            break;
-        }
+    if (!higherMandatoryEntry.models().isEmpty() && higherMandatoryEntry.version() > m_currentImageVersion) {
+        downloadAndInstallEntry(higherMandatoryEntry);
     } else {
+        // There is no mandatory version newer than the current one, let's see if there is a recommended one
+        IndexEntry higherRecommendedEntry;
+        foreach(const IndexEntry& entry, entries) {
+            if (entry.type() == IndexEntry::RecommendedUpdate && entry.models().contains(m_model)) {
+                if (higherRecommendedEntry.models().isEmpty()) {
+                    higherRecommendedEntry = entry;
+                } else if (higherRecommendedEntry.version() < entry.version()) {
+                    higherRecommendedEntry = entry;
+                }
+            }
+        }
+
+        if (!higherRecommendedEntry.models().isEmpty() && higherRecommendedEntry.version() > m_currentImageVersion) {
+            Q_EMIT newRecommendedUpdate(higherRecommendedEntry);
+        }
         qApp->exit();
     }
 }

=== modified file 'systemimageclient.h'
--- systemimageclient.h	2012-07-18 14:49:17 +0000
+++ systemimageclient.h	2012-07-23 15:22:24 +0000
@@ -71,7 +71,7 @@
     void downloadImageFinished(bool success, quint64 size);
 
     void updateToDesiredVersion(const QList<IndexEntry> &entries);
-    void updateToNewestVersion(const QList<IndexEntry> &entries);
+    void updateToNewestMandatoryVersion(const QList<IndexEntry> &entries);
     void downloadAndInstallEntry(const IndexEntry &entry);
 
     enum DownloadTarget {

=== modified file 'tests/systemimageclient/data/index_test_version'
--- tests/systemimageclient/data/index_test_version	2012-07-19 14:01:36 +0000
+++ tests/systemimageclient/data/index_test_version	2012-07-23 15:22:24 +0000
@@ -5,7 +5,7 @@
 model: cp001
 model: cp002
 version: 1
-type: recommended
+type: mandatory
 size: 196443793
 hash_type: sha1
 hash: da39a3ee5e6b4b0d3255bfef95601890afd80709
@@ -28,7 +28,7 @@
 model: cp002
 model: ct001
 version: 2
-type: recommended
+type: mandatory
 size: 193443793
 hash_type: sha1
 hash: da39a3ee5e6b4b0d3255bfef95601890afd80709

=== modified file 'tests/systemimageclient/systemimageclienttest.cpp'
--- tests/systemimageclient/systemimageclienttest.cpp	2012-07-19 14:01:36 +0000
+++ tests/systemimageclient/systemimageclienttest.cpp	2012-07-23 15:22:24 +0000
@@ -180,6 +180,44 @@
     }
 
     // Test the SystemImageClient chooses the right update for our model and version
+    // even if there is a newer recommended update
+    // It is a mandatory update as we can see in the index_test_version file
+    void testMandatoryUpdateCorrectVersionNewerRecommended()
+    {
+        SystemImageClient sic;
+        RecommendedUpdatesReceiver rur;
+
+        sic.m_indexRootLocation = "SomewhereOverTheRainbow";
+        sic.setModel("cp001");
+        sic.setCurrentImageVersion(1);
+        sic.setSystemPartitions(QStringList() << "dontcare");
+
+        QVERIFY(sic.isOk());
+
+        connect(&sic, SIGNAL(newRecommendedUpdate(IndexEntry)), &rur, SLOT(newRecommendedUpdate(IndexEntry)));
+
+        sic.m_downloadManager.m_filesContentToReturn << DATADIR"index_test_version" << DATADIR"test_image";
+        const bool startStatus = sic.startCheckNewImage();
+
+        QVERIFY(startStatus);
+
+        QTest::qWait(100);
+
+        QCOMPARE(rur.m_updatesReceived, 0);
+        QCOMPARE(sic.m_downloadManager.m_lastDownloadedUrl, QUrl("SomewhereOverTheRainbow/1204x3x4x5-2.xz"));
+        QCOMPARE(sic.m_imageEntryToUpdateTo.name(), QString("Jolly Jaguar 2nd update for X3, X4 and X5"));
+        QCOMPARE(sic.m_imageEntryToUpdateTo.filename(), QString("1204x3x4x5-2.xz"));
+        QCOMPARE(sic.m_imageEntryToUpdateTo.models(), QStringList() << "cp001" << "cp002" << "ct001");
+        QCOMPARE(sic.m_imageEntryToUpdateTo.version(), 2ULL);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.type(), IndexEntry::MandatoryUpdate);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.size(), 193443793ULL);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.hashType(), HashUtils::Sha1Hash);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.hash(), QString("da39a3ee5e6b4b0d3255bfef95601890afd80709"));
+        QCOMPARE(sic.m_imageEntryToUpdateTo.security(), IndexEntry::SignedFile);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.changelogSecurity(), IndexEntry::RawFile);
+    }
+
+    // Test the SystemImageClient chooses the right update for our model and version
     // It is a mandatory update as we can see in the index_test_version file
     void testMandatoryUpdateCorrectVersionRawFile()
     {
@@ -272,7 +310,7 @@
         QCOMPARE(sic.m_imageEntryToUpdateTo.filename(), QString("1204x3x5.xz"));
         QCOMPARE(sic.m_imageEntryToUpdateTo.models(), QStringList() << "cp001" << "cp002");
         QCOMPARE(sic.m_imageEntryToUpdateTo.version(), 1ULL);
-        QCOMPARE(sic.m_imageEntryToUpdateTo.type(), IndexEntry::RecommendedUpdate);
+        QCOMPARE(sic.m_imageEntryToUpdateTo.type(), IndexEntry::MandatoryUpdate);
         QCOMPARE(sic.m_imageEntryToUpdateTo.size(), 196443793ULL);
         QCOMPARE(sic.m_imageEntryToUpdateTo.hashType(), HashUtils::Sha1Hash);
         QCOMPARE(sic.m_imageEntryToUpdateTo.hash(), QString("da39a3ee5e6b4b0d3255bfef95601890afd80709"));
@@ -310,7 +348,7 @@
         QCOMPARE(dw.m_entries[0].filename(), QString("1204x3x5.xz"));
         QCOMPARE(dw.m_entries[0].models(), QStringList() << "cp001" << "cp002");
         QCOMPARE(dw.m_entries[0].version(), 1ULL);
-        QCOMPARE(dw.m_entries[0].type(), IndexEntry::RecommendedUpdate);
+        QCOMPARE(dw.m_entries[0].type(), IndexEntry::MandatoryUpdate);
         QCOMPARE(dw.m_entries[0].size(), 196443793ULL);
         QCOMPARE(dw.m_entries[0].hashType(), HashUtils::Sha1Hash);
         QCOMPARE(dw.m_entries[0].hash(), QString("da39a3ee5e6b4b0d3255bfef95601890afd80709"));
@@ -321,7 +359,7 @@
         QCOMPARE(dw.m_entries[1].filename(), QString("1204x3x4x5-2.xz"));
         QCOMPARE(dw.m_entries[1].models(), QStringList() << "cp001" << "cp002" << "ct001");
         QCOMPARE(dw.m_entries[1].version(), 2ULL);
-        QCOMPARE(dw.m_entries[1].type(), IndexEntry::RecommendedUpdate);
+        QCOMPARE(dw.m_entries[1].type(), IndexEntry::MandatoryUpdate);
         QCOMPARE(dw.m_entries[1].size(), 193443793ULL);
         QCOMPARE(dw.m_entries[1].hashType(), HashUtils::Sha1Hash);
         QCOMPARE(dw.m_entries[1].hash(), QString("da39a3ee5e6b4b0d3255bfef95601890afd80709"));