Merge lp:~alecu/ubuntuone-control-panel/mock-timestamp into lp:ubuntuone-control-panel

[Alejandro J. Cura]

- Force a fake timestamp for the webclient tests (LP:#1186294).

- Force a fake timestamp for the webclient tests (LP:#1186294).

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py	2013-02-22 19:54:41 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py	2013-05-31 16:51:27 +0000
@@ -52,6 +52,7 @@
     'oauth_signature_method=HMAC-SHA1&next=%%2Fblah&oauth_version=1.0&' \
     'oauth_token=%s&oauth_signature=s6h0LRBiWchTADrTJWaJUSuaGpo3D' % \
     (SAMPLE_CREDENTIALS['consumer_key'], SAMPLE_CREDENTIALS['token'])
+FAKE_TIMESTAMP = 1
 
 
 def sample_get_credentials():
@@ -108,8 +109,13 @@
         self.base_iri = self.ws.get_iri()
 
         self.wc = WebClient(sample_get_credentials, base_url=self.base_iri)
+        self.patch(self.wc.wc, "get_timestamp", self.fake_get_timestamp)
         self.addCleanup(self.wc.shutdown)
 
+    def fake_get_timestamp(self):
+        """A fake get_timestamp."""
+        return defer.succeed(FAKE_TIMESTAMP)
+
     def test_correct_app_name(self):
         """Assert that the wc uses the correct appname."""
         self.assertEqual(APP_NAME, self.wc.wc.appname)