Merge lp:~zyga/checkbox/checkbox-touch-fixes into lp:checkbox

[Zygmunt Krynicki]

835d8a1 checkbox-touch: sort requirements
32ff640 checkbox-touch: add missing requirements
f4d1107 checkbox-touch:py: remove unused imports
82192fa checkbox-touch:py: remove unused variable

[Sylvain Pineau (sylvain-pineau)]

Good cleanup, +1

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~zkrynicki/checkbox/checkbox-touch-fixes into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.07user 0.00system 0:05.21elapsed 1%CPU (0avgtext+0avgdata 7864maxresident)k
[precise] (timing) 0inputs+32outputs (0major+6061minor)pagefaults 0swaps
[precise] provisioning container
[precise] Unable to provision requirements in container!
[precise] stdout: http://paste.ubuntu.com/10021308/
[precise] stderr: http://paste.ubuntu.com/10021309/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed container to reclaim resources
[trusty] starting container
[trusty] (timing) 0.06user 0.00system 0:04.41elapsed 1%CPU (0avgtext+0avgdata 7868maxresident)k
[trusty] (timing) 0inputs+32outputs (0major+5790minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] Unable to provision requirements in container!
[trusty] stdout: http://paste.ubuntu.com/10021310/
[trusty] stderr: http://paste.ubuntu.com/10021311/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed container to reclaim resources

Destroying precise-testing failed
Destroying trusty-testing failed

Unmerged revisions

3560. By Zygmunt Krynicki on 2015-02-02

checkbox-touch:py: remove unused variable

Signed-off-by: Zygmunt Krynicki <email address hidden>

3559. By Zygmunt Krynicki on 2015-02-02

checkbox-touch:py: remove unused imports

Signed-off-by: Zygmunt Krynicki <email address hidden>

3558. By Zygmunt Krynicki on 2015-02-02

checkbox-touch: add missing requirements

This patch adds missing dependencies to run 'qmlscene main.qml' natively
on Ubuntu 14.10+, using virtualenv with plainbox.
 - pyotherside
 - qml-module-qtquick-layouts
 - qmlscene

Signed-off-by: Zygmunt Krynicki <email address hidden>

3557. By Zygmunt Krynicki on 2015-02-02

checkbox-touch: sort requirements

Signed-off-by: Zygmunt Krynicki <email address hidden>

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2015-01-30 16:09:37 +0000
+++ checkbox-touch/py/checkbox_touch.py	2015-02-02 19:48:49 +0000
@@ -43,11 +43,9 @@
 import traceback
 
 from plainbox.abc import IJobResult
-from plainbox.i18n import gettext as _
 from plainbox.impl.clitools import ToolBase
 from plainbox.impl.exporter import get_all_exporters
 from plainbox.impl.providers.special import get_categories
-from plainbox.impl.providers.special import get_stubbox
 from plainbox.impl.providers.v1 import all_providers
 from embedded_providers import EmbeddedProvider1PlugInCollection
 from plainbox.impl.runner import JobRunner
@@ -437,7 +435,7 @@
             with open(os.path.join(self._get_app_cache_directory(),
                       'session_id')) as f:
                 session_id = f.readline().rstrip('\n')
-        except (OSError, IOError) as e:
+        except (OSError, IOError):
             session_id = None
         self._init_session_storage_repo()
         for storage in self.session_storage_repo.get_storage_list():

=== modified file 'checkbox-touch/requirements/deb-touch.txt'
--- checkbox-touch/requirements/deb-touch.txt	2014-08-26 09:19:44 +0000
+++ checkbox-touch/requirements/deb-touch.txt	2015-02-02 19:48:49 +0000
@@ -1,4 +1,7 @@
+pyotherside
+qml-module-qtquick-layouts
+qmlscene
+qtdeclarative5-test-plugin
+qtdeclarative5-ubuntu-ui-toolkit-plugin
 xauth
 xvfb
-qtdeclarative5-test-plugin
-qtdeclarative5-ubuntu-ui-toolkit-plugin