Merge lp:~kissiel/checkbox/fixes-confinement into lp:checkbox

[Maciej Kisielewski]

This MR fixes confined jobs.

In addition it also brings version string checking when running build-me, so the problem can be avoided in the future.

Details in commit messages.

30d0bac checkbox-touch: add fake pyotherside to let importing of checkbox_touch.py
2868b5d checkbox-touch: correct version string in manifest.json
bd310da checkbox-touch: add version match checks to build-me
6e66010 checkbox-touch: change formatting in manifest.json

[Sylvain Pineau (sylvain-pineau)]

Good catch with the version mismatch. thanks (and +1 for the check in build-me)

review: Approve

=== modified file 'checkbox-touch/build-me'
--- checkbox-touch/build-me	2015-11-25 11:37:14 +0000
+++ checkbox-touch/build-me	2016-04-19 12:29:16 +0000
@@ -11,7 +11,9 @@
 import textwrap
 
 from confinement.generate import generate_confinement
+sys.path.append('./py')
 from py.embedded_providers import EmbeddedProvider1PlugInCollection
+from py.checkbox_touch import CheckboxTouchApplication
 
 # DEFAULT_PROVIDERS is a list of providers directory names as listed in
 # ../providers. NOTE: those are directory names, not provider names as reported
@@ -59,6 +61,18 @@
                 "{} not found!\nHave you run get-libs?".format(path))
 
 
+def check_versions_match(manifest):
+    """Check if version coded in python matches one from manifest.json."""
+    res = CheckboxTouchApplication().get_version_pair()
+    version_from_py = res['result']['application_version']
+
+    if manifest['version'] != version_from_py:
+        raise Exception(
+            ("Version mismatch! Version from checkbox_touch.py: {}, "
+             "version from manifest.json: {}").format(
+                    version_from_py, manifest['version']))
+
+
 def get_revision_string(path='.'):
     # Try getting revno from bazaar vcs
     try:
@@ -140,6 +154,7 @@
         sys.exit('Provider validation failed.')
 
     current_manifest = json.loads(open('manifest.json', 'rt').read())
+    check_versions_match(current_manifest)
     hooks = {
         'checkbox-touch': current_manifest['hooks']['checkbox-touch']
     }
 
=== modified file 'checkbox-touch/manifest.json'
--- checkbox-touch/manifest.json	2016-04-19 06:28:06 +0000
+++ checkbox-touch/manifest.json	2016-04-19 12:29:16 +0000
@@ -1,5 +1,9 @@
 {
-    "architecture": ["armhf", "i386", "amd64"],
+    "architecture": [
+        "armhf",
+        "i386",
+        "amd64"
+    ],
     "description": "System testing utility for Ubuntu",
     "framework": "ubuntu-sdk-14.10",
     "hooks": {
@@ -11,9 +15,9 @@
     "maintainer": "Zygmunt Krynicki <[e-mail]>",
     "name": "com.ubuntu.checkbox",
     "title": "Checkbox",
-    "version": "1.3.dev0",
+    "version": "1.3.dev",
     "x-source": {
         "vcs-bzr": "lp:checkbox",
         "vcs-bzr-revno": "checkbox-touch-v1.3.dev0"
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2016-02-17 09:31:44 +0000
+++ checkbox-touch/py/checkbox_touch.py	2016-04-19 12:29:16 +0000
@@ -1,6 +1,6 @@
 # This file is part of Checkbox.
 #
-# Copyright 2014-2015 Canonical Ltd.
+# Copyright 2014-2016 Canonical Ltd.
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
 #   Maciej Kisielewski <[e-mail]>
@@ -35,7 +35,23 @@
 import json
 import logging
 import os
-import pyotherside
+try:
+    import pyotherside
+except ImportError:
+    class FakePyOtherSide():
+        """
+        Bogus pyotherside that does nothing.
+
+        CheckboxTouchUI uses pyotherside to propagate the output of running
+        job's command to the QML side.
+
+        pyotherside module is only available when python is run by PyOtherSide;
+        If this module is imported elsewhere (e.g. tests, packaging, etc.),
+        this bogus class is used instead.
+        """
+        def send(self, event, *args):
+            pass
+    pyotherside = FakePyOtherSide()
 import sqlite3
 import re
 import time