Ubuntu One Control Panel

Merge lp:~brian.curtin/ubuntuone-control-panel/nessitas-crash-fix into lp:ubuntuone-control-panel

  1. nessitas-crash-fix
  2. Merge into trunk
Proposed by Brian Curtin on 2012-03-21
Status: Merged
Approved by: Roberto Alsina on 2012-03-21
Approved revision: 294
Merged at revision: 294
Proposed branch: lp:~brian.curtin/ubuntuone-control-panel/nessitas-crash-fix
Merge into: lp:ubuntuone-control-panel
Diff against target: 14 lines (+3/-1)
1 file modified
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+3/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-control-panel/nessitas-crash-fix
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-03-21 Approve on 2012-03-21
Review via email: mp+98735@code.launchpad.net

Commit Message

Better cleanup in tests -- allow the rest of the test suite to complete. Fix courtesy of Natalia Bidart.

Description of the Change

Better cleanup in tests -- allow the rest of the test suite to complete. Fix courtesy of Natalia Bidart.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
2--- ubuntuone/controlpanel/gui/qt/tests/__init__.py 2012-03-08 20:46:13 +0000
3+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py 2012-03-21 21:19:20 +0000
4@@ -275,7 +275,9 @@
5 self.ui = self.class_ui(**self.kwargs)
6 # pylint: enable=E1102
7 self.ui.show()
8- self.addCleanup(self.ui.destroy)
9+ self.addCleanup(self.ui.hide)
10+ self.addCleanup(self.ui.deleteLater)
11+ self.addCleanup(QtCore.QCoreApplication.instance().processEvents)
12
13 if getattr(self.ui, 'backend', None) is not None:
14 self.addCleanup(self.ui.backend._called.clear)

Subscribers

People subscribed via source and target branches