Merge lp:~mardy/ubuntu-system-settings-online-accounts/hooks-timestamp into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Regenerate hooks whenever file time changes

Regenerate hooks whenever file time changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/962
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24637

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/262/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Looks ok to me.

review: Approve

[lp:~mardy/ubuntu-system-settings-online-accounts/hooks-timestamp]

302. By Alberto Mardegan on 2015-10-28

Close file before setting timestamp

=== modified file 'click-hooks/accounts.cpp'
--- click-hooks/accounts.cpp	2015-09-28 14:35:19 +0000
+++ click-hooks/accounts.cpp	2015-10-28 13:59:26 +0000
@@ -35,6 +35,8 @@
 #include <QStandardPaths>
 #include <QStringList>
 #include <click.h>
+#include <sys/types.h>
+#include <utime.h>
 #include "acl-updater.h"
 
 static QString findPackageDir(const QString &appId)
@@ -692,7 +694,7 @@
          */
         QFileInfo processedInfo(fileInfo.filePath() + ".processed");
         if (processedInfo.exists() &&
-            processedInfo.lastModified() >= fileInfo.lastModified()) {
+            processedInfo.lastModified() == fileInfo.lastModified()) {
             continue;
         }
 
@@ -704,7 +706,14 @@
 
         if (manifest.writeFiles(accountsDir)) {
             QFile file(processedInfo.filePath());
-            if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+                file.close();
+                struct utimbuf sourceTime;
+                sourceTime.actime = sourceTime.modtime =
+                    fileInfo.lastModified().toTime_t();
+                utime(processedInfo.filePath().toUtf8().constData(),
+                      &sourceTime);
+            } else {
                 qWarning() << "Could not create timestamp file" <<
                     processedInfo.filePath();
             }

=== modified file 'click-hooks/main.cpp'
--- click-hooks/main.cpp	2015-08-28 10:20:33 +0000
+++ click-hooks/main.cpp	2015-10-28 13:59:26 +0000
@@ -30,6 +30,8 @@
 #include <QStandardPaths>
 #include <QStringList>
 #include <click.h>
+#include <sys/types.h>
+#include <utime.h>
 
 static QString findPackageDir(const QString &appId)
 {
@@ -212,6 +214,10 @@
     file.close();
 
     if (ok) {
+        struct utimbuf sourceTime;
+        sourceTime.actime = sourceTime.modtime =
+            m_hookFileInfo.lastModified().toTime_t();
+        utime(fileName.toUtf8().constData(), &sourceTime);
         return true;
     } else {
         QFile::remove(fileName);
@@ -342,7 +348,7 @@
         QFileInfo destinationInfo(destination);
         /* If the destination is there and up to date, we have nothing to do */
         if (destinationInfo.exists() &&
-            destinationInfo.lastModified() >= fileInfo.lastModified()) {
+            destinationInfo.lastModified() == fileInfo.lastModified()) {
             continue;
         }
 

=== modified file 'tests/click-hooks/tst_online_accounts_hooks.cpp'
--- tests/click-hooks/tst_online_accounts_hooks.cpp	2015-08-28 10:20:33 +0000
+++ tests/click-hooks/tst_online_accounts_hooks.cpp	2015-10-28 13:59:26 +0000
@@ -28,6 +28,9 @@
 #include <QProcess>
 #include <QSignalSpy>
 #include <QTest>
+#include <sys/types.h>
+#include <time.h>
+#include <utime.h>
 
 #define TEST_DIR "/tmp/hooks-test"
 
@@ -465,6 +468,8 @@
     clearHooksDir();
     clearInstallDir();
 
+    time_t oldTime = time(NULL) - 3;
+
     writeHookFile("com-ubuntu.test_MyApp_1.0.application",
         "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
         "<application>\n"
@@ -511,6 +516,32 @@
     root = doc.documentElement();
     QCOMPARE(root.firstChildElement("profile").text(),
              QString("com-ubuntu.test_MyApp_1.1"));
+
+    // Create an *older* file
+    clearHooksDir();
+    QString fileName("com-ubuntu.test_MyApp_1.2.application");
+    writeHookFile(fileName,
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application>\n"
+        "  <description>My application</description>\n"
+        "  <service-types>\n"
+        "    <service-type>some type</service-type>\n"
+        "  </service-types>\n"
+        "</application>");
+    struct utimbuf sourceTime;
+    sourceTime.actime = sourceTime.modtime = oldTime;
+    utime(m_hooksDir.filePath(fileName).toUtf8().constData(), &sourceTime);
+
+    QVERIFY(runHookProcess());
+
+    // check that the file has been updated with the correct profile
+    file.close();
+    file.setFileName(m_installDir.absoluteFilePath(installedName));
+    QVERIFY(file.open(QIODevice::ReadOnly));
+    QVERIFY(doc.setContent(&file));
+    root = doc.documentElement();
+    QCOMPARE(root.firstChildElement("profile").text(),
+             QString("com-ubuntu.test_MyApp_1.2"));
 }
 
 void OnlineAccountsHooksTest::testDesktopEntry_data()