Merge lp:~dobey/ubuntuone-storage-protocol/merge-to-stable-3-0 into lp:ubuntuone-storage-protocol/stable-3-0

[dobey]

Use the dedicated time url.

Use the dedicated time url.

[lp:~dobey/ubuntuone-storage-protocol/merge-to-stable-3-0]

146. By dobey on 2011-12-20

Pull in a fix that was missed in a previously landed branch

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/test_client.py'
--- tests/test_client.py	2011-11-14 16:36:04 +0000
+++ tests/test_client.py	2011-12-20 16:13:25 +0000
@@ -175,10 +175,6 @@
         self.called = False
         self.volume = None
 
-    def tearDown(self):
-        """Clean up."""
-        self.client = None
-
     def test_init_maxpayloadsize(self):
         """Get the value from the constant at init time."""
         self.assertEqual(self.client.max_payload_size,

=== modified file 'ubuntuone/storageprotocol/utils.py'
--- ubuntuone/storageprotocol/utils.py	2011-10-04 03:20:53 +0000
+++ ubuntuone/storageprotocol/utils.py	2011-12-20 16:13:25 +0000
@@ -34,7 +34,7 @@
 
     CHECKING_INTERVAL = 60 * 60  # in seconds
     ERROR_INTERVAL = 30  # in seconds
-    SERVER_URL = "http://one.ubuntu.com/"
+    SERVER_URL = "http://one.ubuntu.com/api/time"
 
     def __init__(self):
         """Initialize this instance."""