Merge lp:~bjornt/landscape-client/gir-test-failures into lp:~landscape/landscape-client/trunk
Proposed by
Björn Tillenius
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Thomas Herve | ||||
Approved revision: | 623 | ||||
Merged at revision: | 625 | ||||
Proposed branch: | lp:~bjornt/landscape-client/gir-test-failures | ||||
Merge into: | lp:~landscape/landscape-client/trunk | ||||
Diff against target: |
439 lines (+63/-102) 10 files modified
landscape/ui/controller/tests/test_app.py (+5/-7) landscape/ui/controller/tests/test_configuration.py (+4/-8) landscape/ui/model/configuration/tests/test_mechanism.py (+8/-12) landscape/ui/model/configuration/tests/test_proxy.py (+4/-10) landscape/ui/model/configuration/tests/test_state.py (+9/-19) landscape/ui/model/configuration/tests/test_uisettings.py (+3/-3) landscape/ui/model/registration/tests/test_mechanism.py (+7/-14) landscape/ui/model/registration/tests/test_proxy.py (+9/-16) landscape/ui/tests/helpers.py (+5/-4) landscape/ui/view/tests/test_configuration.py (+9/-9) |
||||
To merge this branch: | bzr merge lp:~bjornt/landscape-client/gir-test-failures | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jerry Seutter (community) | Approve | ||
Thomas Herve (community) | Approve | ||
Review via email: mp+148412@code.launchpad.net |
Commit message
Make ui tests skpi when GIR is available but dbus isn't.
Description of the change
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.
To post a comment you must log in.
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 manager. tests.test_ eucalyptus. EucalyptusTest. test_run_ with_failure_ message manager. tests.test_ eucalyptus. EucalyptusTest. test_run_ with_successful _message manager. tests.test_ eucalyptus. EucalyptusTest. test_successful _run_stops_ service_ hub manager. tests.test_ eucalyptus. GetEucalyptusIn foTest. test_wb_ get_eucalyptus_ info manager. tests.test_ eucalyptus. StartServiceHub Test.test_ start_service_ hub manager. tests.test_ eucalyptus. StartServiceHub Test.test_ start_service_ hub_with_ existing_ data_dir ------- ------- ------- ------- ------- ------- ------- ------- ------- ------- --
landscape.
landscape.
landscape.
landscape.
landscape.
landscape.
-------
Ran 2245 tests in 147.100s
PASSED (skips=7, successes=2238)
And your branch:
======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == jseutter/ src/landscape- client/ gir-test- failures/ landscape/ ui/model/ registration/ tests/test_ mechanism. py", line 19, in setUp BusName( INTERFACE_ NAME, MechanismTest.bus) AttributeError: type object 'MechanismTest' has no attribute 'bus'
[ERROR]
Traceback (most recent call last):
File "/home/
self.bus_name = dbus.service.
exceptions.
landscape. ui.model. registration. tests.test_ mechanism. MechanismTest. test_disabling_ fail ui.model. registration. tests.test_ mechanism. MechanismTest. test_disabling_ succeed ui.model. registration. tests.test_ mechanism. MechanismTest. test_exit ui.model. registration. tests.test_ mechanism. MechanismTest. test_registrati on_fail ui.model. registration. tests.test_ mechanism. MechanismTest. test_registrati on_succeed ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == jseutter/ src/landscape- client/ gir-test- failures/ landscape/ ui/model/ registration/ tests/test_ proxy.py" , line 81, in setUp nProxyTest. bus) AttributeError: type object 'RegistrationPr oxyTest' has no attribute 'bus'
landscape.
landscape.
landscape.
landscape.
=======
[ERROR]
Traceback (most recent call last):
File "/home/
Registratio
exceptions.
landscape. ui.model. registration. tests.test_ proxy.Registrat ionProxyTest. test_disable ui.model. registration. tests.test_ proxy.Registrat ionProxyTest. test_exit ui.model. registration. tests.test_ proxy.Registrat ionProxyTest. test_register ------- ------- ------- ------- ------- ------- ------- ------- ------- ------- --
landscape.
landscape.
-------
Ran 2244 tests in 145.865s
FAILED (skips=7, errors=29, successes=2208)
I haven't looked into the problem any deeper.