Ubuntu One Client

Merge lp:~thisfred/ubuntuone-client/lp-806668 into lp:ubuntuone-client

  1. lp-806668
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Natalia Bidart
Approved revision: 1045
Merged at revision: 1044
Proposed branch: lp:~thisfred/ubuntuone-client/lp-806668
Merge into: lp:ubuntuone-client
Diff against target: 121 lines (+18/-9)
1 file modified
tests/platform/linux/test_dbus.py (+18/-9)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-client/lp-806668
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+67094@code.launchpad.net

Commit message

* Fixed more tests to play nice with twisted (LP: #806668)

Description of the change

* Fixed more tests to play nice with twisted (LP: #806668)

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

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py 2011-06-28 17:25:05 +0000
+++ tests/platform/linux/test_dbus.py 2011-07-06 21:42:36 +0000
@@ -2230,9 +2230,10 @@
22302230
2231 timeout = 22231 timeout = 2
22322232
2233 @defer.inlineCallbacks
2233 def setUp(self):2234 def setUp(self):
2234 """Init."""2235 """Init."""
2235 super(TestSendingAllEvents, self).setUp()2236 yield super(TestSendingAllEvents, self).setUp()
2236 self.patch(DBusInterface, 'test', True)2237 self.patch(DBusInterface, 'test', True)
2237 self.patch(dbus, 'Interface', FakedSSOBackend)2238 self.patch(dbus, 'Interface', FakedSSOBackend)
2238 self.patch(dbus.service, 'BusName', FakedBusName)2239 self.patch(dbus.service, 'BusName', FakedBusName)
@@ -2245,6 +2246,7 @@
2245 self.main = FakeMain(self.root_dir, self.shares_dir,2246 self.main = FakeMain(self.root_dir, self.shares_dir,
2246 self.data_dir, self.partials_dir)2247 self.data_dir, self.partials_dir)
22472248
2249 @defer.inlineCallbacks
2248 def tearDown(self, *args):2250 def tearDown(self, *args):
2249 """Shutdown."""2251 """Shutdown."""
2250 self.main.shutdown()2252 self.main.shutdown()
@@ -2252,7 +2254,7 @@
2252 self.rmtree(self.root_dir)2254 self.rmtree(self.root_dir)
2253 self.rmtree(self.data_dir)2255 self.rmtree(self.data_dir)
2254 self.rmtree(self.partials_dir)2256 self.rmtree(self.partials_dir)
2255 super(TestSendingAllEvents, self).tearDown()2257 yield super(TestSendingAllEvents, self).tearDown()
22562258
2257 def test_not_active(self):2259 def test_not_active(self):
2258 """All event listener is not subscribed by default."""2260 """All event listener is not subscribed by default."""
@@ -2666,9 +2668,10 @@
2666 method = 'register'2668 method = 'register'
2667 autoconnecting = False2669 autoconnecting = False
26682670
2671 @defer.inlineCallbacks
2669 def setUp(self):2672 def setUp(self):
2670 """Init."""2673 """Init."""
2671 super(DBusOAuthTestCase, self).setUp()2674 yield super(DBusOAuthTestCase, self).setUp()
2672 self.events = []2675 self.events = []
2673 self.patch(DBusInterface, 'test', True)2676 self.patch(DBusInterface, 'test', True)
2674 self.patch(dbus, 'Interface', FakedSSOBackend)2677 self.patch(dbus, 'Interface', FakedSSOBackend)
@@ -2689,6 +2692,7 @@
2689 logger.addHandler(self.memento)2692 logger.addHandler(self.memento)
2690 self.addCleanup(lambda: logger.removeHandler(self.memento))2693 self.addCleanup(lambda: logger.removeHandler(self.memento))
26912694
2695 @defer.inlineCallbacks
2692 def tearDown(self, *args):2696 def tearDown(self, *args):
2693 """Shutdown."""2697 """Shutdown."""
2694 self.main.shutdown()2698 self.main.shutdown()
@@ -2696,7 +2700,7 @@
2696 self.rmtree(self.root_dir)2700 self.rmtree(self.root_dir)
2697 self.rmtree(self.data_dir)2701 self.rmtree(self.data_dir)
2698 self.rmtree(self.partials_dir)2702 self.rmtree(self.partials_dir)
2699 super(DBusOAuthTestCase, self).tearDown()2703 yield super(DBusOAuthTestCase, self).tearDown()
27002704
2701 @defer.inlineCallbacks2705 @defer.inlineCallbacks
2702 def test_signals_are_connected(self):2706 def test_signals_are_connected(self):
@@ -3506,9 +3510,10 @@
3506class TestStatusEmitSignals(DBusTwistedTestCase, MockerTestCase):3510class TestStatusEmitSignals(DBusTwistedTestCase, MockerTestCase):
3507 """Test that the emit method have been correctly implemented."""3511 """Test that the emit method have been correctly implemented."""
35083512
3513 @defer.inlineCallbacks
3509 def setUp(self):3514 def setUp(self):
3510 """Setup tests."""3515 """Setup tests."""
3511 super(TestStatusEmitSignals, self).setUp()3516 yield super(TestStatusEmitSignals, self).setUp()
3512 self.signal_method = self.mocker.mock()3517 self.signal_method = self.mocker.mock()
35133518
3514 def test_emit_content_queue_changed(self):3519 def test_emit_content_queue_changed(self):
@@ -3663,9 +3668,10 @@
3663class TestSyncDaemonEmitSignals(DBusTwistedTestCase, MockerTestCase):3668class TestSyncDaemonEmitSignals(DBusTwistedTestCase, MockerTestCase):
3664 """Test that the emit method have been correctly implemented."""3669 """Test that the emit method have been correctly implemented."""
36653670
3671 @defer.inlineCallbacks
3666 def setUp(self):3672 def setUp(self):
3667 """Setup tests."""3673 """Setup tests."""
3668 super(TestSyncDaemonEmitSignals, self).setUp()3674 yield super(TestSyncDaemonEmitSignals, self).setUp()
3669 self.signal_method = self.mocker.mock()3675 self.signal_method = self.mocker.mock()
36703676
36713677
@@ -3690,9 +3696,10 @@
3690class TestSharesEmitSignals(DBusTwistedTestCase, MockerTestCase):3696class TestSharesEmitSignals(DBusTwistedTestCase, MockerTestCase):
3691 """Test that the emit method have been correctly implemented."""3697 """Test that the emit method have been correctly implemented."""
36923698
3699 @defer.inlineCallbacks
3693 def setUp(self):3700 def setUp(self):
3694 """Setup tests."""3701 """Setup tests."""
3695 super(TestSharesEmitSignals, self).setUp()3702 yield super(TestSharesEmitSignals, self).setUp()
3696 self.signal_method = self.mocker.mock()3703 self.signal_method = self.mocker.mock()
3697 self.shares.syncdaemon_shares = self.mocker.mock()3704 self.shares.syncdaemon_shares = self.mocker.mock()
3698 self.get_share_dict = self.mocker.replace(3705 self.get_share_dict = self.mocker.replace(
@@ -3838,9 +3845,10 @@
3838class TestFoldersEmitSignals(DBusTwistedTestCase, MockerTestCase):3845class TestFoldersEmitSignals(DBusTwistedTestCase, MockerTestCase):
3839 """Test that the emit method have been correctly implemented."""3846 """Test that the emit method have been correctly implemented."""
38403847
3848 @defer.inlineCallbacks
3841 def setUp(self):3849 def setUp(self):
3842 """Setup tests."""3850 """Setup tests."""
3843 super(TestFoldersEmitSignals, self).setUp()3851 yield super(TestFoldersEmitSignals, self).setUp()
3844 self.signal_method = self.mocker.mock()3852 self.signal_method = self.mocker.mock()
3845 self.get_udf_dict = self.mocker.replace(3853 self.get_udf_dict = self.mocker.replace(
3846 'ubuntuone.syncdaemon.interaction_interfaces.get_udf_dict')3854 'ubuntuone.syncdaemon.interaction_interfaces.get_udf_dict')
@@ -3912,9 +3920,10 @@
3912class TestPublicFilesEmitSignals(DBusTwistedTestCase, MockerTestCase):3920class TestPublicFilesEmitSignals(DBusTwistedTestCase, MockerTestCase):
3913 """Test that the emit method have been correctly implemented."""3921 """Test that the emit method have been correctly implemented."""
39143922
3923 @defer.inlineCallbacks
3915 def setUp(self):3924 def setUp(self):
3916 """Setup tests."""3925 """Setup tests."""
3917 super(TestPublicFilesEmitSignals, self).setUp()3926 yield super(TestPublicFilesEmitSignals, self).setUp()
3918 self.signal_method = self.mocker.mock()3927 self.signal_method = self.mocker.mock()
3919 self.public_files.syncdaemon_public_files = self.mocker.mock()3928 self.public_files.syncdaemon_public_files = self.mocker.mock()
3920 self.bool_str = self.mocker.replace(3929 self.bool_str = self.mocker.replace(

Subscribers

People subscribed via source and target branches