Merge lp:~kissiel/checkbox/move-launcher-to-pbox into lp:checkbox

[Maciej Kisielewski]

This MR moves launcher definitions to plainbox (from checkbox-ng)

This is a first step to get launchers working on Ubuntu Touch Device - we don't want to pull checkbox-ng to the device. Other reasoning includes:

1) Launchers are designed to be shared between different *box front-ends. So
having them defined in checkbox-ng means any other front-end wanting to use
launchers would have to depend on checkbox-ng.
2) There is nothing in launchers that's related to checkbox-ng.
3) Launchers are kinds of PlainboxConfigs

0bda82c checkbox-ng: use SECURE_ID_PATTERN from plainbox
fc3c845 move launcher-related classes to plainbox
9be32d9 checkbox-ng:checkbox-cli: sort imports

[Sylvain Pineau (sylvain-pineau)]

Juts one question, see below.

[Sylvain Pineau (sylvain-pineau)]

Thanks for the InvalidSecureIDError removal. +1 for this move (indeed pulling checkbox-ng just to have launcher config was not ideal)

review: Approve

[Sylvain Pineau (sylvain-pineau)]

The attempt to merge lp:~kissiel/checkbox/move-launcher-to-pbox into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.09user 0.09system 0:04.36elapsed 4%CPU (0avgtext+0avgdata 10248maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8257minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 44.92user 18.35system 1:11.70elapsed 88%CPU (0avgtext+0avgdata 96728maxresident)k
[precise] (timing) 0inputs+19072outputs (0major+3198955minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/20159496/
[precise-testing] stderr: http://paste.ubuntu.com/20159497/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 0.69user 0.12system 0:00.86elapsed 96%CPU (0avgtext+0avgdata 48232maxresident)k
[precise-testing] (timing) 0inputs+1368outputs (0major+21977minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 30.02user 0.24system 0:30.31elapsed 99%CPU (0avgtext+0avgdata 150668maxresident)k
[precise-testing] (timing) 0inputs+1376outputs (0major+39233minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.01system 0:00.02elapsed 72%CPU (0avgtext+0avgdata 2184maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2373minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.04user 0.10system 0:01.16elapsed 98%CPU (0avgtext+0avgdata 46624maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14294minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.23user 0.05system 0:00.29elapsed 96%CPU (0avgtext+0avgdata 14564maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+6074minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 52.52user 1.56system 0:54.24elapsed 99%CPU (0avgtext+0avgdata 201068maxresident)k
[precise-testing] (timing) 0inputs+3304outputs (0major+261455minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 146.54user 0.58system 2:27.43elapsed 99%CPU (0avgtext+0avgdata 184104maxresident)k
[precise-testing] (timing) 0inputs+43208outputs (0major+58191minor)pagefaul...

[lp:~kissiel/checkbox/move-launcher-to-pbox]

4443. By Maciej Kisielewski on 2016-07-21

checkbox-ng: remove InvalidSecureIDError from checkbox-ng

And use the one from plainbox.

Signed-off-by: Maciej Kisielewski <email address hidden>

[Maciej Kisielewski (kissiel)]

Tarmac failed because of the missing import.
Added the magic line and retested.
Self-approving.

=== modified file 'checkbox-ng/checkbox_ng/certification.py'
--- checkbox-ng/checkbox_ng/certification.py	2016-02-17 10:14:38 +0000
+++ checkbox-ng/checkbox_ng/certification.py	2016-07-21 08:52:09 +0000
@@ -31,24 +31,16 @@
 import re
 
 from plainbox.impl.secure.config import Unset
+from plainbox.impl.transport import InvalidSecureIDError
+from plainbox.impl.transport import SECURE_ID_PATTERN
 from plainbox.impl.transport import TransportBase
 from plainbox.impl.transport import TransportError
 import requests
 
-from checkbox_ng.config import SECURE_ID_PATTERN
-
 
 logger = getLogger("checkbox.ng.certification")
 
 
-class InvalidSecureIDError(ValueError):
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return repr(self.value)
-
-
 class CertificationTransport(TransportBase):
     """
     Transport for sending data to certification database.

=== modified file 'checkbox-ng/checkbox_ng/commands/launcher.py'
--- checkbox-ng/checkbox_ng/commands/launcher.py	2016-03-01 09:41:13 +0000
+++ checkbox-ng/checkbox_ng/commands/launcher.py	2016-07-21 08:52:09 +0000
@@ -32,9 +32,9 @@
 from checkbox_ng.commands.newcli import CliInvocation2
 from checkbox_ng.commands.submit import SubmitCommand
 from checkbox_ng.config import CheckBoxConfig
-from checkbox_ng.launcher import LauncherDefinition
 
 from plainbox.impl.commands.cmd_checkbox import CheckBoxCommandMixIn
+from plainbox.impl.launcher import LauncherDefinition
 
 logger = logging.getLogger("checkbox.ng.commands.launcher")
 

=== modified file 'checkbox-ng/checkbox_ng/commands/submit.py'
--- checkbox-ng/checkbox_ng/commands/submit.py	2015-06-10 14:48:45 +0000
+++ checkbox-ng/checkbox_ng/commands/submit.py	2016-07-21 08:52:09 +0000
@@ -34,9 +34,9 @@
 from plainbox.impl.commands import PlainBoxCommand
 from plainbox.impl.secure.config import Unset
 from plainbox.impl.transport import TransportError
+from plainbox.impl.transport import SECURE_ID_PATTERN
 
 from checkbox_ng.certification import CertificationTransport
-from checkbox_ng.config import SECURE_ID_PATTERN
 
 
 class SubmitInvocation:

=== modified file 'checkbox-ng/checkbox_ng/config.py'
--- checkbox-ng/checkbox_ng/config.py	2015-09-04 09:38:01 +0000
+++ checkbox-ng/checkbox_ng/config.py	2016-07-21 08:52:09 +0000
@@ -28,9 +28,7 @@
 
 from plainbox.impl.applogic import PlainBoxConfig
 from plainbox.impl.secure import config
-
-
-SECURE_ID_PATTERN = r"^[a-zA-Z0-9]{15}$|^[a-zA-Z0-9]{18}$"
+from plainbox.impl.transport import SECURE_ID_PATTERN
 
 
 class CheckBoxConfig(PlainBoxConfig):

=== modified file 'checkbox-ng/checkbox_ng/test_certification.py'
--- checkbox-ng/checkbox_ng/test_certification.py	2015-06-10 15:14:06 +0000
+++ checkbox-ng/checkbox_ng/test_certification.py	2016-07-21 08:52:09 +0000
@@ -30,6 +30,7 @@
 
 from pkg_resources import resource_string
 from plainbox.impl.applogic import PlainBoxConfig
+from plainbox.impl.transport import InvalidSecureIDError
 from plainbox.impl.transport import TransportError
 from plainbox.vendor import mock
 from plainbox.vendor.mock import MagicMock
@@ -37,7 +38,6 @@
 import requests
 
 from checkbox_ng.certification import CertificationTransport
-from checkbox_ng.certification import InvalidSecureIDError
 
 
 class CertificationTransportTests(TestCase):

=== modified file 'checkbox-ng/launchers/checkbox-cli'
--- checkbox-ng/launchers/checkbox-cli	2016-06-03 10:14:48 +0000
+++ checkbox-ng/launchers/checkbox-cli	2016-07-21 08:52:09 +0000
@@ -39,31 +39,31 @@
 from guacamole.ingredients import cmdtree
 from guacamole.recipes.cmd import CommandRecipe
 
-from checkbox_ng.certification import InvalidSecureIDError
-from checkbox_ng.launcher import DefaultLauncherDefinition
-from checkbox_ng.launcher import LauncherDefinition
 from plainbox.abc import IJobResult
 from plainbox.i18n import ngettext
 from plainbox.i18n import pgettext as C_
+from plainbox.impl.color import Colorizer
 from plainbox.impl.commands.inv_run import Action
 from plainbox.impl.commands.inv_run import ActionUI
 from plainbox.impl.commands.inv_run import NormalUI
 from plainbox.impl.commands.inv_run import ReRunJob
 from plainbox.impl.commands.inv_run import seconds_to_human_duration
-from plainbox.impl.color import Colorizer
 from plainbox.impl.ingredients import CanonicalCrashIngredient
 from plainbox.impl.ingredients import RenderingContextIngredient
 from plainbox.impl.ingredients import SessionAssistantIngredient
-from plainbox.impl.result import tr_outcome
+from plainbox.impl.launcher import DefaultLauncherDefinition
+from plainbox.impl.launcher import LauncherDefinition
 from plainbox.impl.result import JobResultBuilder
 from plainbox.impl.result import MemoryJobResult
-from plainbox.vendor.textland import get_display
+from plainbox.impl.result import tr_outcome
 from plainbox.impl.session.assistant import SA_RESTARTABLE
 from plainbox.impl.session.jobs import InhibitionCause
+from plainbox.impl.session.restart import detect_restart_strategy
 from plainbox.impl.session.restart import get_strategy_by_name
-from plainbox.impl.session.restart import detect_restart_strategy
+from plainbox.impl.transport import TransportError
+from plainbox.impl.transport import InvalidSecureIDError
 from plainbox.impl.transport import get_all_transports
-from plainbox.impl.transport import TransportError
+from plainbox.vendor.textland import get_display
 
 from checkbox_ng.misc import SelectableJobTreeNode
 from checkbox_ng.ui import ScrollableTreeNode

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2016-07-12 21:09:34 +0000
+++ checkbox-touch/py/checkbox_touch.py	2016-07-21 08:52:09 +0000
@@ -181,7 +181,7 @@
         self.assistant.use_alternate_execution_controllers(ctrl_setup_list)
 
         if launcher_definition:
-            from checkbox_ng.launcher import LauncherDefinition
+            from plainbox.impl.launcher import LauncherDefinition
             generic_launcher = LauncherDefinition()
             generic_launcher.read([launcher_definition])
             config_filename = os.path.expandvars(

=== renamed file 'checkbox-ng/checkbox_ng/launcher.py' => 'plainbox/plainbox/impl/launcher.py'
--- checkbox-ng/checkbox_ng/launcher.py	2016-05-26 18:38:57 +0000
+++ plainbox/plainbox/impl/launcher.py	2016-07-21 08:52:09 +0000
@@ -18,22 +18,22 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-:mod:`checkbox_ng.launcher` -- launcher definition
+:mod:`plainbox.impl.launcher` -- launcher definition
 ==================================================
 """
 
 from gettext import gettext as _
 import logging
 
-from checkbox_ng.config import SECURE_ID_PATTERN
 from plainbox.impl.applogic import PlainBoxConfig
 from plainbox.impl.secure import config
 from plainbox.impl.session.assistant import get_all_sa_flags
 from plainbox.impl.session.assistant import get_known_sa_api_versions
 from plainbox.impl.transport import get_all_transports
-
-
-logger = logging.getLogger("checkbox.ng.launcher")
+from plainbox.impl.transport import SECURE_ID_PATTERN
+
+
+logger = logging.getLogger("plainbox.launcher")
 
 
 class LauncherDefinition(PlainBoxConfig):

=== renamed file 'checkbox-ng/checkbox_ng/test_launcher.py' => 'plainbox/plainbox/impl/test_launcher.py'
--- checkbox-ng/checkbox_ng/test_launcher.py	2016-03-01 09:41:13 +0000
+++ plainbox/plainbox/impl/test_launcher.py	2016-07-21 08:52:09 +0000
@@ -17,10 +17,10 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-checkbox_ng.test_launcher
+plainbox.impl.test_launcher
 =========================
 
-Test definitions for checkbox_ng.launcher module
+Test definitions for plainbox.imlp.launcher module
 """
 
 from unittest import TestCase
@@ -28,9 +28,9 @@
 
 from plainbox.impl.secure.config import Unset
 
-from launcher import LauncherDefinition
-from launcher import LauncherDefinitionLegacy
-from launcher import LauncherDefinition1
+from plainbox.impl.launcher import LauncherDefinition
+from plainbox.impl.launcher import LauncherDefinitionLegacy
+from plainbox.impl.launcher import LauncherDefinition1
 
 
 class LauncherDefinitionTests(TestCase):