Merge lp:~ralsina/ubuntuone-windows-installer/fix-823655 into lp:ubuntuone-windows-installer

Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 31
Merged at revision: 28
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix-823655
Merge into: lp:ubuntuone-windows-installer
Diff against target: 26 lines (+6/-0)
2 files modified
ubuntuone_installer/gui/qt/gui.py (+1/-0)
ubuntuone_installer/gui/qt/tests/test_gui.py (+5/-0)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix-823655
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Review via email: mp+71105@code.launchpad.net

Commit message

Initialize _next_id

Description of the change

A member was not initialized and it failed sometimes.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
30. By Roberto Alsina

added test

31. By Roberto Alsina

better docstring

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py 2011-08-05 19:34:29 +0000
+++ ubuntuone_installer/gui/qt/gui.py 2011-08-10 20:12:53 +0000
@@ -95,6 +95,7 @@
95 """Wizard Page that displays the license info and links to the GPL."""95 """Wizard Page that displays the license info and links to the GPL."""
9696
97 def __init__(self, parent=None):97 def __init__(self, parent=None):
98 self._next_id = None
98 super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)99 super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
99 self.header.setVisible(False)100 self.header.setVisible(False)
100101
101102
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py 2011-08-05 19:01:03 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py 2011-08-10 20:12:53 +0000
@@ -376,6 +376,11 @@
376 self.assertEqual(self.ui.LICENSE_PAGE.nextId(),376 self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
377 self.ui.local_folders_page_id)377 self.ui.local_folders_page_id)
378378
379 def test_license_next_default(self):
380 """By default, should be the sign in page."""
381 self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
382 self.ui.SIGNIN_PAGE)
383
379384
380class FakeSignal(object):385class FakeSignal(object):
381386

Subscribers

People subscribed via source and target branches