ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/lp1616800 into lp:ubuntu-system-settings

lp1616800
Merge into trunk

Proposed by Jonas G. Drange on 2016-08-25

Status:

Merged

Approved by:

Jonas G. Drange on 2016-08-25

Approved revision:

1703

Merged at revision:

1709

Proposed branch:

lp:~jonas-drange/ubuntu-system-settings/lp1616800

Merge into:

lp:ubuntu-system-settings

Diff against target:

69 lines (+32/-2)

2 files modified

plugins/system-update/click/manager_impl.cpp (+9/-2)
tests/plugins/system-update/tst_clickmanager.cpp (+23/-0)

To merge this branch:

bzr merge lp:~jonas-drange/ubuntu-system-settings/lp1616800

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine		2016-08-25	Approve on 2016-08-25
system-apps-ci-bot	continuous-integration		Approve on 2016-08-25
Review via email: mp+303912@code.launchpad.net

Commit Message

do not overwrite updatedAt

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-25:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/130/rebuild

review: Approve (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/lp1616800 updated on 2016-08-25

1703. By Jonas G. Drange on 2016-08-25: extend sync test, and add updatedAt for manually installed clicks

Ken VanDine (ken-vandine) wrote on 2016-08-25:

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Jonas G. Drange

Ubuntu Touch System Settings

 === modified file 'plugins/system-update/click/manager_impl.cpp'
 --- plugins/system-update/click/manager_impl.cpp	2016-08-16 11:42:49 +0000
 +++ plugins/system-update/click/manager_impl.cpp	2016-08-25 12:17:36 +0000
@@ -302,8 +302,15 @@
              /* The local version of a click in the manifest, matched exactly a
              a remote version in one of our db updates. */
              if (manifestUpdate->localVersion() == dbUpdate->remoteVersion()) {
--                m_model->setInstalled(dbUpdate->identifier(),
--                                      dbUpdate->revision());
++                // We can't know when it was updated, so now() will have to do.
++                if (!dbUpdate->updatedAt().isValid()) {
++                    dbUpdate->setUpdatedAt(QDateTime::currentDateTimeUtc());
++                }
++                dbUpdate->setState(Update::State::StateInstallFinished);
++                dbUpdate->setInstalled(true);
++                dbUpdate->setDownloadId("");
++                dbUpdate->setError("");
++                m_model->update(dbUpdate);
                  found = true;
              } else if (manifestUpdate->identifier() == dbUpdate->identifier()) {
                  // Fast forward the local version.
 === modified file 'tests/plugins/system-update/tst_clickmanager.cpp'
 --- tests/plugins/system-update/tst_clickmanager.cpp	2016-08-12 07:40:41 +0000
 +++ tests/plugins/system-update/tst_clickmanager.cpp	2016-08-25 12:17:36 +0000
@@ -27,6 +27,7 @@
  #include "plugins/system-update/faketokendownloader.h"
  #include "plugins/system-update/faketokendownloader_factory.h"
++#include <QDateTime>
  #include <QDir>
  #include <QJsonArray>
  #include <QJsonParseError>
@@ -276,6 +277,7 @@
          Q_FOREACH(auto update, markedInstalled) {
              QVERIFY(m_model->get(update)->installed());
++            QVERIFY(m_model->get(update)->updatedAt().isValid());
+         }
          Q_FOREACH(auto update, uninstalled) {
              QVERIFY(!m_model->get(update)->installed());
@@ -513,6 +515,27 @@
+     {
          // Verify that a SessionToken is requested even if a check has not run.
+     }
++    void testSynchronizationDoesNotOverwriteUpdatedAt()
++    {
++        // Fix for lp:1616800
++        auto update = createUpdate("a", 0);
++        auto updatedAt = QDateTime(QDate(2016, 2, 29), QTime(18, 0), Qt::UTC);
++        update->setRemoteVersion("v1");
++        update->setInstalled(true);
++        update->setUpdatedAt(updatedAt);
++        m_model->add(update);
++
++        /* Trigger synchronization using data to indicate that a.0 was
++        installed. */
++        QByteArray manifest("[{"
++            "\"name\": \"a\","
++            "\"version\": \"v1\""
++        "}]");
++        m_mockmanifest->mockSuccess(JSONfromQByteArray(manifest));
++
++        auto dbUpdated = m_model->get("a", 0);
++        QCOMPARE(update->updatedAt(), dbUpdated->updatedAt());
++    }
  private:
      // Create JSON Array from a QByteArray.
      QJsonArray JSONfromQByteArray(const QByteArray &byteArray)

ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/lp1616800 into lp:ubuntu-system-settings

Commit Message

Description of the Change

Preview Diff

Subscribers