Merge lp:~alecu/ubuntuone-windows-installer/timestamp-autofix into lp:ubuntuone-windows-installer

[Alejandro J. Cura]

Do a HEAD request on the server to get accurate timestamp (LP: #692597).

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

This branch depends on:
 * lp:~alecu/ubuntuone-storage-protocol/timestamp-autofix
 * lp:~alecu/ubuntuone-control-panel/timestamp-autofix

To test it on linux, point run-test to the dependent branches, like this:
  PYTHONPATH=~/canonical/ubuntuone-storage-protocol/timestamp-autofix/:~/canonical/ubuntuone-control-panel/timestamp-autofix/ ./run-tests

[Diego Sarmentero (diegosarmentero)]

+1

[Diego Sarmentero (diegosarmentero)]

+1 approve!

review: Approve

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-30 15:36:08 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-10-07 14:48:29 +0000
@@ -30,6 +30,7 @@
     sign_url,
     FOLDER_INVALID_PATH,
 )
+from ubuntuone.controlpanel.web_client.txwebclient import timestamp_checker
 from ubuntuone.platform.credentials import CredentialsManagementTool
 from ubuntu_sso.qt.gui import SSOWizardPage
 
@@ -280,7 +281,8 @@
             logger.exception('Error while trying to get credentials:')
             creds = {}
         if creds:
-            signed_url = sign_url(url, creds)
+            timestamp = yield timestamp_checker.get_faithful_time()
+            signed_url = yield sign_url(url, creds, timestamp)
         else:
             signed_url = url
         QtGui.QDesktopServices.openUrl(QtCore.QUrl(signed_url))

=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-30 15:32:57 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-10-07 14:48:29 +0000
@@ -613,3 +613,34 @@
             "initializePage", self._set_called)
         self.ui.cleanupPage()
         self.assertEqual(self._called, ((), {}))
+
+    def test_on_add_storage_button_clicked_async_sign_url(self):
+        """on_add_storage_button_clicked knows that sign_url is async."""
+        test_url = "http://test/url"
+        test_timestamp = 1234
+
+        def fake_find_credentials(cmt):
+            """A fake find_credentials."""
+            return defer.succeed({"fake": "credentials"})
+
+        def fake_get_timestamp():
+            """A fake get_timestamp."""
+            return defer.succeed(test_timestamp)
+
+        def fake_sign_url(url, creds, timestamp):
+            """A fake sign_url."""
+            self.assertEqual(timestamp, test_timestamp)
+            return defer.succeed(test_url)
+
+        @staticmethod
+        def fake_open_url(url):
+            """A fake QtGui.QDesktopServices.openUrl."""
+            self.assertEqual(url.toString(), test_url)
+
+        self.patch(local_folders.CredentialsManagementTool,
+                   "find_credentials", fake_find_credentials)
+        self.patch(local_folders.timestamp_checker,
+                   "get_faithful_time", fake_get_timestamp)
+        self.patch(local_folders, "sign_url", fake_sign_url)
+        self.patch(QtGui.QDesktopServices, "openUrl", fake_open_url)
+        self.ui.on_add_storage_button_clicked()