Merge lp://staging/~tealeg/landscape-client/catch-unreachable-server into lp://staging/~landscape/landscape-client/trunk

[1]

         self._register_handlers()
         if self._bus:
- return self._interface.register(config_path,
- reply_handler=reply_handler,
- error_handler=error_handler)
+ try:
+ result, message = self._interface.register(config_path)
+ except dbus.DBusException, e:
+ if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply":
+ raise
+ else:
+ error_handler("Registration timed out.")
+ if result:

The "result" variable will be undefined if error_handler() is called, and indeed TimeoutTest.test_register fails:

landscape.ui.model.registration.tests.test_proxy
  TimeoutTest
    test_register ... [ERROR]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/free/src/client/trunk/landscape/tests/mocker.py", line 146, in test_method_wrapper
    result = test_method()
  File "/home/free/src/client/trunk/landscape/ui/model/registration/tests/test_proxy.py", line 64, in test_register
    self.proxy.register("foo", error_handler=fake_error_handler)
  File "/home/free/src/client/trunk/landscape/ui/model/registration/proxy.py", line 116, in register
    if result:
exceptions.UnboundLocalError: local variable 'result' referenced before assignment

landscape.ui.model.registration.tests.test_proxy.TimeoutTest.test_register
-------------------------------------------------------------------------------
Ran 1 tests in 0.003s

> [1]
>
> self._register_handlers()
> if self._bus:
> - return self._interface.register(config_path,
> - reply_handler=reply_handler,
> - error_handler=error_handler)
> + try:
> + result, message = self._interface.register(config_path)
> + except dbus.DBusException, e:
> + if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply":
> + raise
> + else:
> + error_handler("Registration timed out.")
> + if result:
>
> The "result" variable will be undefined if error_handler() is called, and
> indeed TimeoutTest.test_register fails:
>
>
> landscape.ui.model.registration.tests.test_proxy
> TimeoutTest
> test_register ...
> [ERROR]
>
> ==============================================================================
> =
> [ERROR]
> Traceback (most recent call last):
> File "/home/free/src/client/trunk/landscape/tests/mocker.py", line 146, in
> test_method_wrapper
> result = test_method()
> File "/home/free/src/client/trunk/landscape/ui/model/registration/tests/test
> _proxy.py", line 64, in test_register
> self.proxy.register("foo", error_handler=fake_error_handler)
> File "/home/free/src/client/trunk/landscape/ui/model/registration/proxy.py",
> line 116, in register
> if result:
> exceptions.UnboundLocalError: local variable 'result' referenced before
> assignment
>
> landscape.ui.model.registration.tests.test_proxy.TimeoutTest.test_register
> ------------------------------------------------------------------------------
> -
> Ran 1 tests in 0.003s

Yup - quite right. Now fixed.

+1!

[2]

+ RegistrationProxy._setup_interface = fake_setup_interface
+ RegistrationProxy._register_handlers = fake_register_handlers
+ RegistrationProxy._remove_handlers = fake_remove_handlers

I believe you need to monkey patch the class instead of the instance because of the self._setup_interface(bus) call in RegistrationProxy.__init__() ?

This is unfortunate, I think RegistrationProxy should rather have a setup() method that you call explicitly to connect to DBus.

Also, the original method of the RegistrationProxy are not restored, so running these tests has (possibly nasty) side effects. I've noticed RegistrationProxyTest does something similar.

Just thought I'd mention it, we can live with this for now and surely it's something for another branch.

Looks good, +1.