Merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10

[dobey]

[Alejandro J. Cura]

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

[Rodney Dawes]

    - Fix pep8 warning.

[Alejandro J. Cura (alecu)]

review: Approve

[lp:~dobey/ubuntuone-control-panel/update-13-10]

402. By Alejandro J. Cura on 2013-05-31

[Alejandro J. Cura]

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

[Rodney Dawes]

    - Fix pep8 warning.

=== modified file 'setup.py'
--- setup.py	2012-11-30 21:03:28 +0000
+++ setup.py	2013-05-31 21:30:15 +0000
@@ -1,11 +1,6 @@
 #!/usr/bin/env python
-# setup.py - Build system for Ubuntu One Control Panel package
-#
-# Authors: Natalia B. Bidart <[e-mail]>
-#          Manuel de la Pena <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2010-2011 Canonical Ltd.
+#
+# Copyright 2010-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2013-02-22 19:54:41 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2013-05-31 21:30:15 +0000
@@ -977,7 +977,7 @@
             username = share['other_visible_name']
             if not username:
                 username = share['other_username'] + \
-                           ' (%s)' % self.be.NAME_NOT_SET
+                    ' (%s)' % self.be.NAME_NOT_SET
 
             shares[username].append(share)
 

=== 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 21:30:15 +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)