Merge lp:~bjornt/landscape-client/gir-test-failures into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Make ui tests skpi when GIR is available but dbus isn't.

The landscape/ui tests are failing when gobject introspection is available, but
dbus isn't. The reason for this is that some tests checks only whether GIR is
available, even though they depend on dbus.

I've changed it so that we only have one variable to control whether the tests
should be skipped and change the skip message depending on what's missing.

It might be possible to run some of the tests with only GIR available, but I
don't think it's worth the trouble trying to do that. Better to keep it easier
and run all the tests when you need to.

[Jerry Seutter (jseutter)]

The changes look good, but I get a problem on my machine.

trunk:

===============================================================================
[SKIPPED]
imagestore module not available

landscape.manager.tests.test_eucalyptus.EucalyptusTest.test_failed_run_stops_service_hub
landscape.manager.tests.test_eucalyptus.EucalyptusTest.test_run_with_failure_message
landscape.manager.tests.test_eucalyptus.EucalyptusTest.test_run_with_successful_message
landscape.manager.tests.test_eucalyptus.EucalyptusTest.test_successful_run_stops_service_hub
landscape.manager.tests.test_eucalyptus.GetEucalyptusInfoTest.test_wb_get_eucalyptus_info
landscape.manager.tests.test_eucalyptus.StartServiceHubTest.test_start_service_hub
landscape.manager.tests.test_eucalyptus.StartServiceHubTest.test_start_service_hub_with_existing_data_dir
-------------------------------------------------------------------------------
Ran 2245 tests in 147.100s

PASSED (skips=7, successes=2238)

And your branch:

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/jseutter/src/landscape-client/gir-test-failures/landscape/ui/model/registration/tests/test_mechanism.py", line 19, in setUp
    self.bus_name = dbus.service.BusName(INTERFACE_NAME, MechanismTest.bus)
exceptions.AttributeError: type object 'MechanismTest' has no attribute 'bus'

landscape.ui.model.registration.tests.test_mechanism.MechanismTest.test_disabling_fail
landscape.ui.model.registration.tests.test_mechanism.MechanismTest.test_disabling_succeed
landscape.ui.model.registration.tests.test_mechanism.MechanismTest.test_exit
landscape.ui.model.registration.tests.test_mechanism.MechanismTest.test_registration_fail
landscape.ui.model.registration.tests.test_mechanism.MechanismTest.test_registration_succeed
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/jseutter/src/landscape-client/gir-test-failures/landscape/ui/model/registration/tests/test_proxy.py", line 81, in setUp
    RegistrationProxyTest.bus)
exceptions.AttributeError: type object 'RegistrationProxyTest' has no attribute 'bus'

landscape.ui.model.registration.tests.test_proxy.RegistrationProxyTest.test_disable
landscape.ui.model.registration.tests.test_proxy.RegistrationProxyTest.test_exit
landscape.ui.model.registration.tests.test_proxy.RegistrationProxyTest.test_register
-------------------------------------------------------------------------------
Ran 2244 tests in 145.865s

FAILED (skips=7, errors=29, successes=2208)

I haven't looked into the problem any deeper.

[Thomas Herve (therve)]

Yeah it's not working for me either, I'm on precise FWIW.

review: Needs Fixing

[lp:~bjornt/landscape-client/gir-test-failures]

623. By Björn Tillenius on 2013-02-18

Set up the bus for the tests that need it.

[Björn Tillenius (bjornt)]

On Mon, Feb 18, 2013 at 09:31:26AM -0000, Thomas Herve wrote:
> Review: Needs Fixing
>
> Yeah it's not working for me either, I'm on precise FWIW.

Ah, sorry. Some of the code that checked whether dbus was available
actually set up the bus as well. I've added that setup to the setUp()
method for the affected tests. I've confirmed that it works on trunk
with dbus available.

--
Björn Tillenius | https://launchpad.net/~bjornt

[Thomas Herve (therve)]

Cool, +1!

review: Approve

[Jerry Seutter (jseutter)]

+1, looks good.

review: Approve

=== modified file 'landscape/ui/controller/tests/test_app.py'
--- landscape/ui/controller/tests/test_app.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/controller/tests/test_app.py	2013-02-18 13:49:27 +0000
@@ -2,9 +2,9 @@
 
 from landscape.ui.tests.helpers import (
     ConfigurationProxyHelper, dbus_test_should_skip, dbus_skip_message,
-    got_gobject_introspection, gobject_skip_message, FakeGSettings)
+    FakeGSettings)
 
-if got_gobject_introspection:
+if not dbus_test_should_skip:
     from gi.repository import Gtk
     from landscape.ui.controller.app import SettingsApplicationController
     from landscape.ui.controller.configuration import ConfigController
@@ -66,8 +66,8 @@
         app = ConnectionRecordingSettingsApplicationController()
         self.assertTrue(app.is_connected("activate", app.setup_ui))
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message
 
 
 class SettingsApplicationControllerUISetupTest(LandscapeTest):
@@ -131,7 +131,5 @@
         self.assertIsInstance(self.app.settings_dialog.controller,
                               ConfigController)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message

=== modified file 'landscape/ui/controller/tests/test_configuration.py'
--- landscape/ui/controller/tests/test_configuration.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/controller/tests/test_configuration.py	2013-02-18 13:49:27 +0000
@@ -1,8 +1,8 @@
 from landscape.ui.tests.helpers import (
     ConfigurationProxyHelper, dbus_test_should_skip, dbus_skip_message,
-    FakeGSettings, got_gobject_introspection, gobject_skip_message)
+    FakeGSettings)
 
-if got_gobject_introspection:
+if not dbus_test_should_skip:
     from landscape.ui.controller.configuration import ConfigController
     import landscape.ui.model.configuration.state
     from landscape.ui.model.configuration.state import (
@@ -162,9 +162,7 @@
         self.assertEqual("landscape.localdomain",
                          self.controller.local_landscape_host)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -206,7 +204,5 @@
         self.assertEqual("", self.controller.local_password)
         self.assertEqual("me.here.com", self.controller.computer_title)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message

=== modified file 'landscape/ui/model/configuration/tests/test_mechanism.py'
--- landscape/ui/model/configuration/tests/test_mechanism.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/model/configuration/tests/test_mechanism.py	2013-02-18 13:49:27 +0000
@@ -1,10 +1,10 @@
-import dbus
 
 from landscape.configuration import LandscapeSetupConfiguration
 from landscape.tests.helpers import LandscapeTest
 from landscape.ui.tests.helpers import (
-    got_gobject_introspection, gobject_skip_message)
-if got_gobject_introspection:
+    dbus_test_should_skip, dbus_skip_message)
+if not dbus_test_should_skip:
+    import dbus
     from landscape.ui.model.configuration.mechanism import (
         ConfigurationMechanism, INTERFACE_NAME)
 
@@ -33,7 +33,9 @@
             default_config_filenames = [self.config_filename]
 
         self.config = MyLandscapeSetupConfiguration()
-        bus_name = dbus.service.BusName(INTERFACE_NAME, MechanismTest.bus)
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        bus = dbus.SessionBus(private=True)
+        bus_name = dbus.service.BusName(INTERFACE_NAME, bus)
         self.mechanism = ConfigurationMechanism(self.config, bus_name)
         self.config.load(["-c", self.config_filename])
 
@@ -200,11 +202,5 @@
         """
         self.assertRaises(SystemExit, self.mechanism.exit)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    else:
-        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-        try:
-            bus = dbus.SessionBus(private=True)
-        except dbus.exceptions.DBusException:
-            skip = "Cannot create private DBus session without X11"
+    if dbus_test_should_skip:
+        skip = dbus_skip_message

=== modified file 'landscape/ui/model/configuration/tests/test_proxy.py'
--- landscape/ui/model/configuration/tests/test_proxy.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/model/configuration/tests/test_proxy.py	2013-02-18 13:49:27 +0000
@@ -1,11 +1,9 @@
 from landscape.configuration import LandscapeSetupConfiguration
 from landscape.ui.tests.helpers import (
-    ConfigurationProxyHelper, dbus_test_should_skip, dbus_skip_message,
-    got_gobject_introspection, gobject_skip_message)
-if got_gobject_introspection:
+    ConfigurationProxyHelper, dbus_test_should_skip, dbus_skip_message)
+if not dbus_test_should_skip:
     from landscape.ui.model.configuration.mechanism import (
         PermissionDeniedByPolicy)
-if not dbus_test_should_skip:
     import dbus
 from landscape.tests.helpers import LandscapeTest
 
@@ -52,9 +50,7 @@
         self.mechanism.load = fake_timeout_failure_load
         self.assertFalse(self.proxy.load([]))
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -187,7 +183,5 @@
         """
         self.assertRaises(SystemExit, self.proxy.exit, asynchronous=False)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message

=== modified file 'landscape/ui/model/configuration/tests/test_state.py'
--- landscape/ui/model/configuration/tests/test_state.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/model/configuration/tests/test_state.py	2013-02-18 13:49:27 +0000
@@ -1,8 +1,8 @@
 from landscape.ui.tests.helpers import (
     ConfigurationProxyHelper, FakeGSettings, dbus_test_should_skip,
-    dbus_skip_message, gobject_skip_message, got_gobject_introspection)
+    dbus_skip_message)
 
-if got_gobject_introspection:
+if not dbus_test_should_skip:
     from landscape.ui.model.configuration.uisettings import UISettings
     import landscape.ui.model.configuration.state
     from landscape.ui.model.configuration.state import (
@@ -64,8 +64,8 @@
                                          exit_method=fake_exit_method))
         self.assertTrue(isinstance(model.get_state(), ExitedState))
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message
 
 
 class ConfigurationModelTest(LandscapeTest):
@@ -253,9 +253,7 @@
         model = ConfigurationModel(proxy=self.proxy, uisettings=uisettings)
         self.assertRaises(SystemExit, model.exit, asynchronous=False)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -313,9 +311,7 @@
         self.assertEqual("CrazyHorse", model.local_account_name)
         self.assertEqual("boink", model.hosted_password)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -364,9 +360,7 @@
         self.assertEqual("Vivadixiesubmarinetransmissionplot",
                          model.hosted_password)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -580,9 +574,7 @@
         self.assertRaises(StateError, state.persist)
         self.assertRaises(StateError, state.revert)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message
 
 
@@ -639,7 +631,5 @@
         self.assertEqual("ThomasPaine", self.proxy.account_name)
         self.assertEqual("TheAgeOfReason", self.proxy.registration_key)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    elif dbus_test_should_skip:
+    if dbus_test_should_skip:
         skip = dbus_skip_message

=== modified file 'landscape/ui/model/configuration/tests/test_uisettings.py'
--- landscape/ui/model/configuration/tests/test_uisettings.py	2012-03-06 15:17:13 +0000
+++ landscape/ui/model/configuration/tests/test_uisettings.py	2013-02-18 13:49:27 +0000
@@ -2,7 +2,7 @@
 from landscape.tests.helpers import LandscapeTest
 from landscape.ui.model.configuration.uisettings import UISettings
 from landscape.ui.tests.helpers import (
-    FakeGSettings, got_gobject_introspection, gobject_skip_message)
+    FakeGSettings, dbus_test_should_skip, dbus_skip_message)
 
 
 class UISettingsTest(LandscapeTest):
@@ -163,5 +163,5 @@
         self.uisettings.set_local_password("Bang")
         self.assertEqual("Bang", self.uisettings.get_local_password())
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message

=== modified file 'landscape/ui/model/registration/tests/test_mechanism.py'
--- landscape/ui/model/registration/tests/test_mechanism.py	2012-03-15 15:12:51 +0000
+++ landscape/ui/model/registration/tests/test_mechanism.py	2013-02-18 13:49:27 +0000
@@ -1,9 +1,8 @@
 import dbus
 
 from landscape.tests.helpers import LandscapeTest
-from landscape.ui.tests.helpers import (
-    got_gobject_introspection, gobject_skip_message)
-if got_gobject_introspection:
+from landscape.ui.tests.helpers import dbus_test_should_skip, dbus_skip_message
+if not dbus_test_should_skip:
     from landscape.ui.model.registration.mechanism import (
         RegistrationMechanism, INTERFACE_NAME)
 
@@ -17,7 +16,9 @@
 
     def setUp(self):
         super(MechanismTest, self).setUp()
-        self.bus_name = dbus.service.BusName(INTERFACE_NAME, MechanismTest.bus)
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        bus = dbus.SessionBus(private=True)
+        self.bus_name = dbus.service.BusName(INTERFACE_NAME, bus)
         self.mechanism = None
 
     def tearDown(self):
@@ -95,13 +96,5 @@
         self.mechanism = RegistrationMechanism(self.bus_name)
         self.assertRaises(SystemExit, self.mechanism.exit)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    else:
-        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-        try:
-            bus = dbus.SessionBus(private=True)
-        except dbus.exceptions.DBusException:
-            skip_string = "Cannot launch private DBus session without X11"
-            test_registration_succeed.skip = skip_string
-            test_registration_fail.skip = skip_string
+    if dbus_test_should_skip:
+        skip = dbus_skip_message

=== modified file 'landscape/ui/model/registration/tests/test_proxy.py'
--- landscape/ui/model/registration/tests/test_proxy.py	2012-03-15 15:12:51 +0000
+++ landscape/ui/model/registration/tests/test_proxy.py	2013-02-18 13:49:27 +0000
@@ -1,9 +1,8 @@
 import dbus
 
 from landscape.tests.helpers import LandscapeTest
-from landscape.ui.tests.helpers import (
-    got_gobject_introspection, gobject_skip_message)
-if got_gobject_introspection:
+from landscape.ui.tests.helpers import dbus_test_should_skip, dbus_skip_message
+if not dbus_test_should_skip:
     from landscape.ui.model.registration.mechanism import (
         RegistrationMechanism, INTERFACE_NAME)
     from landscape.ui.model.registration.proxy import RegistrationProxy
@@ -66,8 +65,8 @@
         [message] = self.error_handler_messages
         self.assertEqual("Registration timed out.", message)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message
 
 
 class RegistrationProxyTest(LandscapeTest):
@@ -78,8 +77,9 @@
 
     def setUp(self):
         super(RegistrationProxyTest, self).setUp()
-        bus_name = dbus.service.BusName(INTERFACE_NAME,
-                                        RegistrationProxyTest.bus)
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        bus = dbus.SessionBus(private=True)
+        bus_name = dbus.service.BusName(INTERFACE_NAME, bus)
 
         def fake_do__registration(this, config_path):
             return True, ""
@@ -137,12 +137,5 @@
         """
         self.assertRaises(SystemExit, self.proxy.exit)
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
-    else:
-        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-        try:
-            bus = dbus.SessionBus(private=True)
-        except dbus.exceptions.DBusException:
-            test_register.skip = ("Cannot launch private DBus session without "
-                                  "X11")
+    if dbus_test_should_skip:
+        skip = dbus_skip_message

=== modified file 'landscape/ui/tests/helpers.py'
--- landscape/ui/tests/helpers.py	2012-03-16 12:09:19 +0000
+++ landscape/ui/tests/helpers.py	2013-02-18 13:49:27 +0000
@@ -5,18 +5,19 @@
 
 from landscape.configuration import LandscapeSetupConfiguration
 
+dbus_test_should_skip = False
 dbus_skip_message = "Cannot launch private DBus session without X11"
 try:
     from gi.repository import GObject, Gtk
     got_gobject_introspection = True
     # Shut up pyflakes
-    gobject_skip_message = GObject._version + str(Gtk.MAJOR_VERSION)
+    dbus_skip_message = GObject._version + str(Gtk.MAJOR_VERSION) 
 except (ImportError, RuntimeError):
     got_gobject_introspection = False
-    gobject_skip_message = "GObject Introspection module unavailable"
+    dbus_test_should_skip = True
+    dbus_skip_message = "GObject Introspection module unavailable"
     bus = object
     bus_name = ""
-    dbus_test_should_skip = True
 
 
 if got_gobject_introspection:
@@ -28,7 +29,6 @@
     # from dbus.service.Object which throws a fit if it notices you using
     # it without a mainloop.
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-    dbus_test_should_skip = False
     try:
         bus = dbus.SessionBus(private=True)
         bus_name = dbus.service.BusName(INTERFACE_NAME, bus)
@@ -36,6 +36,7 @@
         bus = object
         bus_name = ""
         dbus_test_should_skip = True
+        dbus_skip_message = "Cannot launch private DBus session without X11"
 
 
 class ConfigurationProxyHelper(object):

=== modified file 'landscape/ui/view/tests/test_configuration.py'
--- landscape/ui/view/tests/test_configuration.py	2012-05-15 17:30:38 +0000
+++ landscape/ui/view/tests/test_configuration.py	2013-02-18 13:49:27 +0000
@@ -1,10 +1,10 @@
 import sys
 
 from landscape.ui.tests.helpers import (
-    ConfigurationProxyHelper, FakeGSettings, gobject_skip_message,
-    got_gobject_introspection, simulate_gtk_key_release, simulate_gtk_paste)
+    ConfigurationProxyHelper, FakeGSettings, dbus_test_should_skip,
+    dbus_skip_message, simulate_gtk_key_release, simulate_gtk_paste)
 
-if got_gobject_introspection:
+if not dbus_test_should_skip:
     from gi.repository import Gtk
     from landscape.ui.view.configuration import (
         ClientSettingsDialog, sanitise_host_name, is_valid_host_name)
@@ -57,8 +57,8 @@
         """
         self.assertFalse(is_valid_host_name(u"\xc3a"))
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message
 
 
 class ConfigurationViewTest(LandscapeTest):
@@ -540,8 +540,8 @@
         self.run_gtk_eventloop()
         self.assertFalse(dialog.validity_check())
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message
 
 
 class LocalConfigurationViewTest(LandscapeTest):
@@ -604,5 +604,5 @@
                          dialog.local_landscape_host_entry.get_text())
         self.assertEqual("manky", dialog.local_password_entry.get_text())
 
-    if not got_gobject_introspection:
-        skip = gobject_skip_message
+    if dbus_test_should_skip:
+        skip = dbus_skip_message