Ubuntu One Client

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

  1. assertis-is-only-27-stable
  2. Merge into stable-1-6
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 962
Merged at revision: 963
Proposed branch: lp:~alecu/ubuntuone-client/assertis-is-only-27-stable
Merge into: lp:ubuntuone-client/stable-1-6
Diff against target: 29 lines (+3/-3)
1 file modified
tests/status/test_aggregator.py (+3/-3)
To merge this branch: bzr merge lp:~alecu/ubuntuone-client/assertis-is-only-27-stable
Reviewer Review Type Date Requested Status
dobey (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+58424@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/status/test_aggregator.py'
2--- tests/status/test_aggregator.py 2011-04-12 20:41:55 +0000
3+++ tests/status/test_aggregator.py 2011-04-20 02:52:29 +0000
4@@ -1202,7 +1202,7 @@
5 self.assertEqual(self.aggregator.done_counter, 0)
6 self.assertEqual(len(self.aggregator.files_uploading), 0)
7 self.assertEqual(len(self.aggregator.files_downloading), 0)
8- self.assertIs(self.aggregator.queue_done_timer, None)
9+ self.assertIdentical(self.aggregator.queue_done_timer, None)
10
11 def assertMiscCommandQueued(self, fc):
12 """Assert that some command was queued."""
13@@ -1386,7 +1386,7 @@
14 self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
15 fc2 = FakeCommand()
16 self.status_frontend.download_started(fc2)
17- self.assertIs(self.aggregator.queue_done_timer, None)
18+ self.assertIdentical(self.aggregator.queue_done_timer, None)
19 self.aggregator.clock.advance(self.aggregator.finished_delay)
20 self.status_frontend.download_finished(fc2)
21
22@@ -1400,7 +1400,7 @@
23 self.aggregator.clock.advance(self.aggregator.finished_delay / 2)
24 fc2 = FakeCommand()
25 self.status_frontend.upload_started(fc2)
26- self.assertIs(self.aggregator.queue_done_timer, None)
27+ self.assertIdentical(self.aggregator.queue_done_timer, None)
28 self.aggregator.clock.advance(self.aggregator.finished_delay)
29 self.status_frontend.upload_finished(fc2)
30

Subscribers

People subscribed via source and target branches