Merge lp:~alecu/ubuntuone-client/assertis-is-only-27-stable into lp:ubuntuone-client/stable-1-6

[Alejandro J. Cura]

replace assertIs with assertIdentical so tests work on Maverick and earlier (LP: #766181)

replace assertIs with assertIdentical so tests work on Maverick and earlier (LP: #766181)

[Natalia Bidart (nataliabidart)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-04-12 20:41:55 +0000
+++ tests/status/test_aggregator.py	2011-04-20 02:52:29 +0000
@@ -1202,7 +1202,7 @@
         self.assertEqual(self.aggregator.done_counter, 0)
         self.assertEqual(len(self.aggregator.files_uploading), 0)
         self.assertEqual(len(self.aggregator.files_downloading), 0)
-        self.assertIs(self.aggregator.queue_done_timer, None)
+        self.assertIdentical(self.aggregator.queue_done_timer, None)
 
     def assertMiscCommandQueued(self, fc):
         """Assert that some command was queued."""
@@ -1386,7 +1386,7 @@
         self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
         fc2 = FakeCommand()
         self.status_frontend.download_started(fc2)
-        self.assertIs(self.aggregator.queue_done_timer, None)
+        self.assertIdentical(self.aggregator.queue_done_timer, None)
         self.aggregator.clock.advance(self.aggregator.finished_delay)
         self.status_frontend.download_finished(fc2)
 
@@ -1400,7 +1400,7 @@
         self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
         fc2 = FakeCommand()
         self.status_frontend.upload_started(fc2)
-        self.assertIs(self.aggregator.queue_done_timer, None)
+        self.assertIdentical(self.aggregator.queue_done_timer, None)
         self.aggregator.clock.advance(self.aggregator.finished_delay)
         self.status_frontend.upload_finished(fc2)