Merge lp:~sylvain-pineau/checkbox/doc_and_logging_fixes into lp:checkbox

[Sylvain Pineau]

Two small fixes, one for checkbox launcher documentation about converged launchers.
Second is a patch to the exception msg in plainbox.session.state where the unit.id was missing to actually make that msg useful.

Tested by just duplicating a job in the checkbox provider and calling plainbox -h

[Paul Larson (pwlars)]

A couple of flakes pointed out below (would like to keep it clean since I think this is one of them I went through the trouble of correcting a while back).
Otherwise looks like this will help debugging problems like this, thanks!

review: Needs Fixing

[lp:~sylvain-pineau/checkbox/doc_and_logging_fixes]

4389. By Sylvain Pineau on 2016-06-09

plainbox:session:state: Add unit ids to Exception msg

The famous "attempting to add the same unit twice"

[Sylvain Pineau (sylvain-pineau)]

Thanks Paul, falke8 was not run indeed, my bad.

Fixed and re-pushed (and self-approved)

review: Approve

=== modified file 'checkbox-ng/docs/launcher-tutorial.rst'
--- checkbox-ng/docs/launcher-tutorial.rst	2016-05-04 09:21:57 +0000
+++ checkbox-ng/docs/launcher-tutorial.rst	2016-06-09 07:29:19 +0000
@@ -198,8 +198,11 @@
 
 ``type``
 
-Type of UI to use. This has to be set to ``interactive`` or to ``silent``.
-Default value: ``interactive``.
+Type of UI to use. This has to be set to ``interactive``, ``silent`` or
+``converged``.
+Default value: ``interactive``, which runs the Checkbox command line version.
+Note: the ``converged`` UI type will launch the QML interface and requires
+checkbox-converged to be installed on your system.
 Note: using ``silent`` UI type requires forcing test selection and test plan
 selection.
 

=== modified file 'plainbox/plainbox/impl/session/state.py'
--- plainbox/plainbox/impl/session/state.py	2015-12-10 10:08:49 +0000
+++ plainbox/plainbox/impl/session/state.py	2016-06-09 07:29:19 +0000
@@ -390,7 +390,9 @@
             it does so before any of the units from that provider are added.
         """
         if provider in self._provider_list:
-            raise ValueError(_("attempting to add the same provider twice"))
+            raise ValueError(
+                _("attempting to add the same provider twice: %s"
+                  % provider.name))
         self._provider_list.append(provider)
         self.on_provider_added(provider)
         if add_units:
@@ -412,7 +414,8 @@
         This method fires the :meth:`on_unit_added()` signal
         """
         if unit in self._unit_list:
-            raise ValueError(_("attempting to add the same unit twice"))
+            raise ValueError(
+                _("attempting to add the same unit twice: %s" % unit.id))
         self.state.add_unit(unit)
         # NOTE: no need to fire the on_unit_added() signal because the state
         # object and we've connected it to will fire our version.

=== modified file 'plainbox/plainbox/impl/session/test_state.py'
--- plainbox/plainbox/impl/session/test_state.py	2016-05-16 18:10:14 +0000
+++ plainbox/plainbox/impl/session/test_state.py	2016-06-09 07:29:19 +0000
@@ -44,6 +44,7 @@
 from plainbox.impl.testing_utils import make_job
 from plainbox.impl.unit.job import JobDefinition
 from plainbox.impl.unit.unit import Unit
+from plainbox.impl.unit.unit_with_id import UnitWithId
 from plainbox.vendor import mock
 from plainbox.vendor.morris import SignalTestCase
 
@@ -800,7 +801,7 @@
     def setUp(self):
         self.ctx = SessionDeviceContext()
         self.provider = mock.Mock(name='provider', spec_set=Provider1)
-        self.unit = mock.Mock(name='unit', spec_set=Unit)
+        self.unit = mock.Mock(name='unit', spec_set=UnitWithId)
         self.unit.provider = self.provider
         self.provider.unit_list = [self.unit]
         self.provider.problem_list = []