Merge lp:~thisfred/ubuntuone-control-panel/hail-discordia into lp:ubuntuone-control-panel

[Eric Casteleijn]

Skip Unity test when Unity is not installed.

Skip Unity test when Unity is not installed.

[lp:~thisfred/ubuntuone-control-panel/hail-discordia]

143. By Eric Casteleijn on 2011-05-06

skipIf

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-13 18:44:45 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-05-06 14:31:34 +0000
@@ -20,15 +20,21 @@
 
 from __future__ import division
 
+
 from ubuntuone.controlpanel.gtk import gui
 from ubuntuone.controlpanel.gtk.tests import BaseTestCase, FakedSSOBackend
 from ubuntuone.controlpanel.tests import TOKEN
 
+from ubuntuone.devtools.testcase import skipIf
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
 # pylint: disable=W0201, W0212
 
 
+class FakeUnity(object):
+    """Fake Unity module."""
+
+
 class FakeLauncherEntryProps(object):
     """A fake Unity.LauncherEntry.props"""
 
@@ -138,6 +144,7 @@
         """Max size is not bigger than 736x525 (LP: #645526, LP: #683164)."""
         self.assertTrue(self.ui.get_size_request() <= (736, 525))
 
+    @skipIf(not gui.USE_LIBUNITY, 'Must have Unity installed.')
     def test_focus_handler(self):
         """When the window receives focus, the handler is called."""
         THE_FLEP.urgent = True