Merge lp:~facundo/magicicada-gui/initial-started into lp:magicicada-gui

Proposed by Facundo Batista
Status: Merged
Approved by: Natalia Bidart
Approved revision: 29
Merged at revision: 30
Proposed branch: lp:~facundo/magicicada-gui/initial-started
Merge into: lp:magicicada-gui
Diff against target: 37 lines (+15/-0)
2 files modified
magicicada/syncdaemon.py (+3/-0)
magicicada/tests/test_syncdaemon.py (+12/-0)
To merge this branch: bzr merge lp:~facundo/magicicada-gui/initial-started
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+26264@code.launchpad.net

Description of the change

Set is_started at init time.

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

yey!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magicicada/syncdaemon.py'
2--- magicicada/syncdaemon.py 2010-05-27 12:45:13 +0000
3+++ magicicada/syncdaemon.py 2010-05-28 02:51:29 +0000
4@@ -107,7 +107,10 @@
5
6 # load initial data if ubuntuone-client already started
7 if self.dbus.is_sd_started():
8+ self.current_state._set(is_started=True)
9 self._get_initial_data()
10+ else:
11+ self.current_state._set(is_started=False)
12
13
14 def shutdown(self):
15
16=== modified file 'magicicada/tests/test_syncdaemon.py'
17--- magicicada/tests/test_syncdaemon.py 2010-05-27 12:45:13 +0000
18+++ magicicada/tests/test_syncdaemon.py 2010-05-28 02:51:29 +0000
19@@ -189,6 +189,18 @@
20 self.assertEqual(self.sd.current_state.queues, 'queues2')
21 self.assertEqual(self.sd.current_state.connection, 'connection2')
22
23+ def test_is_started_fixed_at_init_no(self):
24+ """Status.is_started is set at init time, to no."""
25+ FakeDBusInterface.fake_sd_started = False
26+ sd = SyncDaemon(FakeDBusInterface)
27+ self.assertFalse(sd.current_state.is_started)
28+
29+ def test_is_started_fixed_at_init_yes(self):
30+ """Status.is_started is set at init time, to yes."""
31+ FakeDBusInterface.fake_sd_started = True
32+ sd = SyncDaemon(FakeDBusInterface)
33+ self.assertTrue(sd.current_state.is_started)
34+
35
36 class ContentQueueChangedTests(BaseTest):
37 """Check the ContenQueueChanged handling."""

Subscribers

People subscribed via source and target branches