Merge lp:~zyga/snapcraft/fix-1484596 into lp:~snappy-dev/snapcraft/core

[Zygmunt Krynicki]

Make integration tests easier to write

This branch contains the follow-up for the improvement of the plainbox feature flags. With plainbox 0.23 [1] released, we can now take advantage of the simple flag [1] which makes each job, possibly, down three lines, instead of 5-6 we had to write before.

[1] http://plainbox.readthedocs.org/en/latest/changelog.html#plainbox-0-23
[2] http://plainbox.readthedocs.org/en/latest/manpages/plainbox-job-units.html#job-flag-simple

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~zyga/snapcraft/fix-1484596 into lp:snapcraft failed. Below is the output from the failed tests.

The project has gotten complex.
Here's the list of units exceeding 10:
- snapcraft/cmds.py:
  286:1: 'cmd' 13

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmpt5q9u6jg/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmpy68neff7/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpjtly1d6n/parts/copy/install/dir/dst
===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration is 0.10 for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 27
Size of the effective execution plan: 27
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 27. Estimated time left: unknown ]--------------
--------------------------[ snapcraft/normal/no-yaml ]--------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml
Category: 2013.com.canonical.plainbox::uncategorised

...................................Warning: unable to find "test_relexepath" in the path
...................................................................
----------------------------------------------------------------------
Ran 102 tests in 2.738s

OK
CRITICAL plainbox.crashes: Executable 'plainbox' invoked with Namespace(color=None, command=<plainbox.impl.commands.cmd_run.RunCommand object at 0x7ff0e61a1438>, debug_console=False, debug_interrupt=False, dont_suppress_output=False, dry_run=False, exclude_pattern_list=[], include_pattern_list=[], log_level=None, non_interactive=False, output_file=<_io.BufferedWriter name='/tmp/tmp.1vH2ytGhgO/result.json'>, output_format='json', output_options='', pdb=False, test_plan='2015.com.canonical.snapcraft::normal', trace=[], transport=None, transport_options=None, transport_where=None, whitelist=[]) has crashed
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/plainbox/impl/clitools.py", line 560, in dispatch_and_catch_exceptions
    return self.dispatch_command(ns)
  File "/usr/lib/python3/dist-packages/plainbox/impl/clitools.py", line 556, in dispatch_command
    return ns.command.invoked(ns)
  File "/usr/lib/python3/dist-packages/plainbox/impl/commands/cmd_run.py", line 44, in invoked
    self.provider_loader, self.config_loader, ns, ns.color).run()
  File "/usr/lib/python3/dist-packages/plainbox/impl/commands/inv_run.py", line 356, in run
    return self.do_normal_sequence()
  File "/usr/lib/python3/dist-packages/plainbox/impl/commands/inv_run.py", line 410, in do_normal_sequence
    self.run_all_selected_jobs()
  File "/usr/lib/python3/dist-packages/plainbox/impl/commands/inv_run.py", line 740, in run_all_selected_jobs
    self.run_sin...

[lp:~zyga/snapcraft/fix-1484596]

215. By Sergio Schvezov on 2015-09-29

Adding a simple scons plugin by sergiusens approved by chipaca

216. By Zygmunt Krynicki on 2015-09-29

Remove boilerplate now implicitly provided by the 'simple' flag

This patch removes two fields from each plainbox job definition:
 - plugin: shell
 - estimated_duration: 0.3

When the simple flag is present the shell plugin is implicitly assumed.
The estimated duration field was simply copy pasted and in the presence
of the simple flag, it is no longer required.

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

217. By Zygmunt Krynicki on 2015-09-29

Mark the plainbox test plan name as translatable

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

[Zygmunt Krynicki (zyga)]

Rebased and pushed.

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-29 07:15:17 +0000
+++ integration-tests/units/jobs.pxu	2015-09-29 11:44:28 +0000
@@ -1,6 +1,4 @@
 id: snapcraft/normal/no-yaml
-plugin: shell
-estimated_duration: 0.1
 command:
     set -x
     OUTPUT=$(${SNAPCRAFT} pull 2>&1)
@@ -9,17 +7,14 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/no-yaml-run
-plugin: shell
-estimated_duration: 0.1
 command:
     set -x
     OUTPUT=$(${SNAPCRAFT} run 2>&1)
     test $? = 1 || exit 1
     echo $OUTPUT | grep "Could not find snapcraft\.yaml\."
+flags: simple has-leftovers
 
 id: snapcraft/normal/assemble-meta-externally
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/assemble .
@@ -30,8 +25,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/assemble-meta
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/assemble .
@@ -53,8 +46,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/local-source
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/local-source .
@@ -66,8 +57,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/local-plugin
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/local-plugin .
@@ -76,8 +65,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-tar
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-tar .
@@ -100,8 +87,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/pypi-config
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/pypi-config .
@@ -115,8 +100,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-make
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-make .
@@ -125,8 +108,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-make-filesets
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-make-filesets .
@@ -144,8 +125,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-make-clean
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-make .
@@ -164,8 +143,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-cmake
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-cmake .
@@ -174,8 +151,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/simple-copy
-plugin: shell
-estimated_duration: 0.5
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/simple-copy .
@@ -184,8 +159,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/conflicts
-plugin: shell
-estimated_duration: 0.3
 command:
     set -x
     cp -rT $PLAINBOX_PROVIDER_DATA/conflicts .
@@ -195,8 +168,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/dependencies
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/dependencies .
@@ -208,8 +179,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/dependencies-circular
-plugin: shell
-estimated_duration: 0.3
 command:
     set -x
     cp -rT $PLAINBOX_PROVIDER_DATA/dependencies .
@@ -220,8 +189,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/dependencies-fail
-plugin: shell
-estimated_duration: 0.3
 command:
     set -x
     cp -rT $PLAINBOX_PROVIDER_DATA/dependencies .
@@ -231,8 +198,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/bzr-head
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/bzr-head .
@@ -247,8 +212,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/bzr-tag
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/bzr-tag .
@@ -264,8 +227,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/git-head
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/git-head .
@@ -281,8 +242,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/git-tag
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/git-tag .
@@ -299,8 +258,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/git-branch
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/git-branch .
@@ -320,8 +277,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/hg-head
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/hg-head .
@@ -337,8 +292,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/hg-tag
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/hg-tag .
@@ -355,8 +308,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/hg-branch
-plugin: shell
-estimated_duration: 0.3
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/hg-branch .
@@ -374,8 +325,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/pip-requirements
-plugin: shell
-estimated_duration: 60
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/pip-requirements .
@@ -385,8 +334,6 @@
 flags: simple has-leftovers
 
 id: snapcraft/normal/build-tool-paths
-plugin: shell
-estimated_duration: 30
 command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/build-tools .

=== modified file 'integration-tests/units/testplans.pxu'
--- integration-tests/units/testplans.pxu	2015-09-11 11:40:55 +0000
+++ integration-tests/units/testplans.pxu	2015-09-29 11:44:28 +0000
@@ -1,6 +1,6 @@
 unit: test plan
 id: normal
-name: Tests for Snapcraft
+_name: Tests for Snapcraft
 include: snapcraft/normal/.*
 
 unit: test plan