1
=== modified file 'plugins/system-update/click/manager_impl.cpp'
2
--- plugins/system-update/click/manager_impl.cpp	2016-08-16 11:42:49 +0000
3
+++ plugins/system-update/click/manager_impl.cpp	2016-08-25 12:17:36 +0000
4
@@ -302,8 +302,15 @@
5
302
            /* The local version of a click in the manifest, matched exactly a
302
            /* The local version of a click in the manifest, matched exactly a
6
303
            a remote version in one of our db updates. */
303
            a remote version in one of our db updates. */
7
304
            if (manifestUpdate->localVersion() == dbUpdate->remoteVersion()) {
304
            if (manifestUpdate->localVersion() == dbUpdate->remoteVersion()) {
10
305
                m_model->setInstalled(dbUpdate->identifier(),
305
                // We can't know when it was updated, so now() will have to do.
11
306
                                      dbUpdate->revision());
306
                if (!dbUpdate->updatedAt().isValid()) {
12
307
                    dbUpdate->setUpdatedAt(QDateTime::currentDateTimeUtc());
13
308
                }
14
309
                dbUpdate->setState(Update::State::StateInstallFinished);
15
310
                dbUpdate->setInstalled(true);
16
311
                dbUpdate->setDownloadId("");
17
312
                dbUpdate->setError("");
18
313
                m_model->update(dbUpdate);
19
307
                found = true;
314
                found = true;
20
308
            } else if (manifestUpdate->identifier() == dbUpdate->identifier()) {
315
            } else if (manifestUpdate->identifier() == dbUpdate->identifier()) {
21
309
                // Fast forward the local version.
316
                // Fast forward the local version.
22
310
317
23
=== modified file 'tests/plugins/system-update/tst_clickmanager.cpp'
24
--- tests/plugins/system-update/tst_clickmanager.cpp	2016-08-12 07:40:41 +0000
25
+++ tests/plugins/system-update/tst_clickmanager.cpp	2016-08-25 12:17:36 +0000
26
@@ -27,6 +27,7 @@
27
27
#include "plugins/system-update/faketokendownloader.h"
27
#include "plugins/system-update/faketokendownloader.h"
28
28
#include "plugins/system-update/faketokendownloader_factory.h"
28
#include "plugins/system-update/faketokendownloader_factory.h"
29
29
29
30
30
#include <QDateTime>
31
30
#include <QDir>
31
#include <QDir>
32
31
#include <QJsonArray>
32
#include <QJsonArray>
33
32
#include <QJsonParseError>
33
#include <QJsonParseError>
34
@@ -276,6 +277,7 @@
35
276
277
36
277
        Q_FOREACH(auto update, markedInstalled) {
278
        Q_FOREACH(auto update, markedInstalled) {
37
278
            QVERIFY(m_model->get(update)->installed());
279
            QVERIFY(m_model->get(update)->installed());
38
280
            QVERIFY(m_model->get(update)->updatedAt().isValid());
39
279
        }
281
        }
40
280
        Q_FOREACH(auto update, uninstalled) {
282
        Q_FOREACH(auto update, uninstalled) {
41
281
            QVERIFY(!m_model->get(update)->installed());
283
            QVERIFY(!m_model->get(update)->installed());
42
@@ -513,6 +515,27 @@
43
513
    {
515
    {
44
514
        // Verify that a SessionToken is requested even if a check has not run.
516
        // Verify that a SessionToken is requested even if a check has not run.
45
515
    }
517
    }
46
518
    void testSynchronizationDoesNotOverwriteUpdatedAt()
47
519
    {
48
520
        // Fix for lp:1616800
49
521
        auto update = createUpdate("a", 0);
50
522
        auto updatedAt = QDateTime(QDate(2016, 2, 29), QTime(18, 0), Qt::UTC);
51
523
        update->setRemoteVersion("v1");
52
524
        update->setInstalled(true);
53
525
        update->setUpdatedAt(updatedAt);
54
526
        m_model->add(update);
55
527
56
528
        /* Trigger synchronization using data to indicate that a.0 was
57
529
        installed. */
58
530
        QByteArray manifest("[{"
59
531
            "\"name\": \"a\","
60
532
            "\"version\": \"v1\""
61
533
        "}]");
62
534
        m_mockmanifest->mockSuccess(JSONfromQByteArray(manifest));
63
535
64
536
        auto dbUpdated = m_model->get("a", 0);
65
537
        QCOMPARE(update->updatedAt(), dbUpdated->updatedAt());
66
538
    }
67
516
private:
539
private:
68
517
    // Create JSON Array from a QByteArray.
540
    // Create JSON Array from a QByteArray.
69
518
    QJsonArray JSONfromQByteArray(const QByteArray &byteArray)
541
    QJsonArray JSONfromQByteArray(const QByteArray &byteArray)
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