Ubuntu One Windows Installer

Merge lp:~diegosarmentero/ubuntuone-windows-installer/fix-tests into lp:ubuntuone-windows-installer

  1. fix-tests
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Natalia Bidart
Approved revision: 83
Merged at revision: 83
Proposed branch: lp:~diegosarmentero/ubuntuone-windows-installer/fix-tests
Merge into: lp:ubuntuone-windows-installer
Diff against target: 220 lines (+31/-10)
8 files modified
ubuntuone_installer/gui/qt/tests/__init__.py (+3/-1)
ubuntuone_installer/gui/qt/tests/test_currentuser.py (+4/-1)
ubuntuone_installer/gui/qt/tests/test_gui.py (+4/-2)
ubuntuone_installer/gui/qt/tests/test_local_folders.py (+4/-2)
ubuntuone_installer/gui/qt/tests/test_setup_account.py (+6/-2)
ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py (+2/-1)
ubuntuone_installer/gui/qt/utils/tests/test_windows.py (+2/-1)
ubuntuone_installer/tests/__init__.py (+6/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/fix-tests
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+80658@code.launchpad.net

Commit message

Fixed Tests (LP: #882519).

Description of the change

Fixed Tests (LP: #882519).

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Seems to work +1

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
2--- ubuntuone_installer/gui/qt/tests/__init__.py 2011-09-15 17:49:32 +0000
3+++ ubuntuone_installer/gui/qt/tests/__init__.py 2011-10-28 11:03:24 +0000
4@@ -19,6 +19,7 @@
5 """The test suite for the Qt UI of the Ubuntu One Installer."""
6
7 from PyQt4 import QtGui, QtCore
8+from twisted.internet import defer
9 from ubuntuone.controlpanel.gui.qt import loadingoverlay
10
11 from ubuntuone_installer.gui.tests import FakedObject
12@@ -143,8 +144,9 @@
13 class_ui = None
14 kwargs = {}
15
16+ @defer.inlineCallbacks
17 def setUp(self):
18- super(BaseTestCase, self).setUp()
19+ yield super(BaseTestCase, self).setUp()
20 # self.class_ui is not callable
21 # pylint: disable=E1102
22 # pylint: disable=C0103
23
24=== modified file 'ubuntuone_installer/gui/qt/tests/test_currentuser.py'
25--- ubuntuone_installer/gui/qt/tests/test_currentuser.py 2011-08-02 20:05:25 +0000
26+++ ubuntuone_installer/gui/qt/tests/test_currentuser.py 2011-10-28 11:03:24 +0000
27@@ -18,6 +18,8 @@
28
29 """Tests for the CurrentUserController."""
30
31+from twisted.internet import defer
32+
33 from ubuntuone_installer.gui.qt import currentuser
34 from ubuntuone_installer.gui.qt.tests import BaseTestCase
35
36@@ -67,11 +69,12 @@
37
38 class_ui = FakeView
39
40+ @defer.inlineCallbacks
41 def setUp(self):
42 """Initialize this test instance."""
43 self.controller = currentuser.CurrentUserController()
44 self.controller.view = FakeView()
45- super(CurrentUserTestCase, self).setUp()
46+ yield super(CurrentUserTestCase, self).setUp()
47
48 def test_login_success(self):
49 """Check that login works correctly."""
50
51=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
52--- ubuntuone_installer/gui/qt/tests/test_gui.py 2011-10-13 10:30:25 +0000
53+++ ubuntuone_installer/gui/qt/tests/test_gui.py 2011-10-28 11:03:24 +0000
54@@ -102,6 +102,7 @@
55
56 class_ui = gui.MainWindow
57
58+ @defer.inlineCallbacks
59 def setUp(self):
60 """Initialize this test instance."""
61 # Faking each SSO object instead of doing it lower
62@@ -118,7 +119,7 @@
63 self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
64 self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
65 self.patch(gui.qt.utils, "add_syncdaemon_to_autostart", NO_OP)
66- super(MainWindowTestCase, self).setUp()
67+ yield super(MainWindowTestCase, self).setUp()
68 setup_page = self.ui.page(self.ui.setup_account_page_id)
69 setup_page.initializePage()
70
71@@ -677,9 +678,10 @@
72 class SignInPageTestCase(BaseTestCase):
73 """Test the SuccessPage code."""
74
75+ @defer.inlineCallbacks
76 def setUp(self):
77 """Initialize this test instance."""
78- super(SignInPageTestCase, self).setUp()
79+ yield super(SignInPageTestCase, self).setUp()
80 self.ui = gui.SignInPage(gui.choose_sign_in_ui.Ui_ChooseSignInPage(),
81 None, None)
82
83
84=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
85--- ubuntuone_installer/gui/qt/tests/test_local_folders.py 2011-10-06 20:28:12 +0000
86+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py 2011-10-28 11:03:24 +0000
87@@ -167,6 +167,7 @@
88
89 class_ui = local_folders.LocalFoldersPage
90
91+ @defer.inlineCallbacks
92 def setUp(self):
93 """Initialize this test instance."""
94 # Create a test folder with a known size
95@@ -181,7 +182,7 @@
96 self.addCleanup(shutil.rmtree, self.tmpdir)
97 self.fake_wizard = FakeMainWindow()
98 self.patch(local_folders.backend, "ControlBackend", FakeCPBackend)
99- super(LocalFoldersWithGetSizeTestCase, self).setUp()
100+ yield super(LocalFoldersWithGetSizeTestCase, self).setUp()
101 self.patch(self.ui, "wizard", lambda: self.fake_wizard)
102
103 @defer.inlineCallbacks
104@@ -216,6 +217,7 @@
105
106 class_ui = local_folders.LocalFoldersPage
107
108+ @defer.inlineCallbacks
109 def setUp(self):
110 """Initialize this test instance."""
111 self.tmpdir = tempfile.mkdtemp()
112@@ -223,7 +225,7 @@
113 self.fake_wizard = FakeMainWindow()
114 self.patch(local_folders.backend, "ControlBackend", FakeCPBackend)
115 self.patch(os.path, 'getsize', lambda *args: 0)
116- super(LocalFoldersTestCase, self).setUp()
117+ yield super(LocalFoldersTestCase, self).setUp()
118 self.patch(self.ui, "wizard", lambda: self.fake_wizard)
119
120 def test_status_before_initialize(self):
121
122=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
123--- ubuntuone_installer/gui/qt/tests/test_setup_account.py 2011-09-28 17:31:15 +0000
124+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py 2011-10-28 11:03:24 +0000
125@@ -22,6 +22,8 @@
126
127 from PyQt4 import QtGui, QtCore
128
129+from twisted.internet import defer
130+
131 from ubuntu_sso.qt import common
132
133 from ubuntuone_installer.gui.qt import setup_account as gui
134@@ -43,8 +45,9 @@
135 parent=None,
136 )
137
138+ @defer.inlineCallbacks
139 def setUp(self):
140- super(SetupAccountTestCase, self).setUp()
141+ yield super(SetupAccountTestCase, self).setUp()
142 self.patch(self.ui, "set_up_button", QtGui.QPushButton())
143
144 def test_init(self):
145@@ -135,11 +138,12 @@
146 parent=None,
147 )
148
149+ @defer.inlineCallbacks
150 def setUp(self):
151 """Initialize this test instance."""
152 # Faking each SSO object instead of doing it lower
153 # so we don't rely on any SSO behaviour
154- super(SetupAccountFakeWizardTestCase, self).setUp()
155+ yield super(SetupAccountFakeWizardTestCase, self).setUp()
156 self.wizard = FakeWizard()
157 self.patch(self.ui, 'wizard', lambda: self.wizard)
158
159
160=== modified file 'ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py'
161--- ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py 2011-09-09 14:33:19 +0000
162+++ ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py 2011-10-28 11:03:24 +0000
163@@ -51,9 +51,10 @@
164
165 class_ui = sync_now_or_later.SyncNowOrLaterPage
166
167+ @defer.inlineCallbacks
168 def setUp(self):
169 """Initialize tests."""
170- super(SyncNowOrLaterTestCase, self).setUp()
171+ yield super(SyncNowOrLaterTestCase, self).setUp()
172 self.main_window = FakeMainWindow()
173 self.patch(self.ui, "wizard", lambda: self.main_window)
174 self.patch(sync_now_or_later.backend, "ControlBackend", FakeCPBackend)
175
176=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
177--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py 2011-10-21 15:23:28 +0000
178+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py 2011-10-28 11:03:24 +0000
179@@ -179,11 +179,12 @@
180
181 """Test add_syncdaemon_to_autostart."""
182
183+ @defer.inlineCallbacks
184 def setUp(self):
185 """Initialize this test instance."""
186 self.registry = FakeRegistry()
187 self.patch(utils.windows, "_winreg", self.registry)
188- super(AutostartTestCase, self).setUp()
189+ yield super(AutostartTestCase, self).setUp()
190
191 def test_add_syncdaemon_to_autostart(self):
192 """Check that the registry is updated correctly."""
193
194=== modified file 'ubuntuone_installer/tests/__init__.py'
195--- ubuntuone_installer/tests/__init__.py 2011-06-22 00:55:46 +0000
196+++ ubuntuone_installer/tests/__init__.py 2011-10-28 11:03:24 +0000
197@@ -19,6 +19,8 @@
198
199 """The test suite for the Ubuntu One Installer"""
200
201+from twisted.internet import defer
202+
203 from ubuntuone.devtools.testcase import TestCase as BaseTestCase
204
205
206@@ -27,10 +29,14 @@
207
208 assertIs = BaseTestCase.assertIdentical
209
210+ @defer.inlineCallbacks
211 def setUp(self):
212+ yield super(TestCase, self).setUp()
213 self._called = False
214
215+ @defer.inlineCallbacks
216 def tearDown(self):
217+ yield super(TestCase, self).tearDown()
218 self._called = False
219
220 def _set_called(self, *args, **kwargs):

Subscribers

People subscribed via source and target branches