Merge lp:~dholbach/snapcraft/1496392 into lp:~snappy-dev/snapcraft/core

[Daniel Holbach]

Add autopkgtest, reshuffle build-deps accordingly and run wrap-and-sort.

One test fails, which also fails, when I run ./runtests.sh locally:

2015.com.canonical.snapcraft::snapcraft/normal/dependencies: fail

To test the autopkgtest, I ran in the branch:

Just once: adt-buildvm-ubuntu-cloud -v

Then:
 bzr bd -- -S
 adt-run --source ../snapcraft_0.2.dsc --- qemu adt-wily-amd64-cloud.img

[Sergio Schvezov (sergiusens)]

thanks for this!

Are you sure on of the tests fail though? The test name has a 'fail' in it
2015.com.canonical.snapcraft::snapcraft/normal/dependencies-fail: pass

:-)

I approve, but am going to wait on elopio

review: Approve

[Daniel Holbach (dholbach)]

-------------[ Running job 11 / 21. Estimated time left: 0:00:03 ]--------------
-----------------------[ snapcraft/normal/dependencies ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/dependencies
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
+ cp -rT /home/daniel/dev/snappy/snapcraft/integration-tests/data/dependencies .
+ snapcraft-coverage stage
Starting new HTTPS connection (1): wiki.ubuntu.com
Pulling p1
Building p1
gcc -shared -fPIC -o libp1.so p1.c
mkdir -p /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include
cp -a libp1.so /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib
cp -a p1.h /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include
make
make install DESTDIR=/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install
Staging p1
Pulling p2
Building p2
gcc -shared -fPIC -o libp2.so -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include/x86_64-linux-gnu -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include/x86_64-linux-gnu -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/lib -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib/x86_64-linux-gnu -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/lib/x86_64-linux-gnu p2.c -lp1
mkdir -p /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/lib /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/include
cp -a libp2.so /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/lib
cp -a p2.h /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/include
make
make install DESTDIR=/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install
Staging p2
Pulling p3
Building p3
gcc -o p3 -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include/x86_64-linux-gnu -I/tmp/cwd-ft5m88da.701b311da688...

[lp:~dholbach/snapcraft/1496392]

170. By Daniel Holbach on 2015-09-17

merge from trunk

171. By Daniel Holbach on 2015-09-17

merged lp:~elopio/snapcraft/dep8 and resolved conflicts

[Daniel Holbach (dholbach)]

Running ./integration-tests/runtests.sh now assemble-meta fails: http://pastebin.ubuntu.com/12435785/

[lp:~dholbach/snapcraft/1496392]

172. By Daniel Holbach on 2015-09-17

add build-essential to test-depends

173. By Daniel Holbach on 2015-09-17

merge trunk

[Daniel Holbach (dholbach)]

It works now!

[Leo Arias (elopio)]

indeed, it works!
Thanks Daniel.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-09-16 11:47:20 +0000
+++ debian/control	2015-09-17 15:07:57 +0000
@@ -6,43 +6,34 @@
                cmake,
                debhelper (>= 9),
                dh-python,
-               git,
-               mercurial,
-               pep8,
-               plainbox,
-               pyflakes,
                python3 (>= 3.4),
                python3-apt,
-               python3-fixtures,
                python3-jsonschema,
-               python3-mccabe,
-               python3-requests,
                python3-setuptools,
-               python3-testscenarios,
                python3-yaml,
                ubuntu-snappy-cli,
                wget,
-               xz-utils,
+               xz-utils
 Homepage: https://launchpad.net/snapcraft
 Vcs-Bzr: lp:snapcraft
 Standards-Version: 3.9.6
 
 Package: snapcraft
 Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         bzr,
+Depends: bzr,
          dpkg-dev,
          git,
+         mercurial,
          python3-apt,
          python3-jsonschema,
          python3-requests,
          python3-yaml,
-         mercurial,
          sudo,
          ubuntu-snappy-cli,
          wget,
          xz-utils,
+         ${misc:Depends},
+         ${python3:Depends}
 Description: easily craft snaps
  Snapcraft aims to make upstream developers' lives easier and as such is not
  a single toolset, but instead is a collection of tools that enable the

=== modified file 'debian/rules'
--- debian/rules	2015-08-25 20:40:26 +0000
+++ debian/rules	2015-09-17 15:07:57 +0000
@@ -3,9 +3,3 @@
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
-
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	python3 setup.py test
-endif
-

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2015-09-17 15:07:57 +0000
@@ -0,0 +1,10 @@
+Test-Command: ./runtests.sh
+Restrictions: allow-stderr, isolation-container
+Depends: @,
+         build-essential,
+         pep8,
+         plainbox,
+         pyflakes,
+         python3-fixtures,
+         python3-mccabe,
+         python3-testscenarios

=== added file 'integration-tests/runtests.sh'
--- integration-tests/runtests.sh	1970-01-01 00:00:00 +0000
+++ integration-tests/runtests.sh	2015-09-17 15:07:57 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+# -*- Mode:sh; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+if [ -z "$SNAPCRAFT" ]; then
+    export SNAPCRAFT=snapcraft
+fi
+
+# Create a temporary directory so that we can run 'manage.py develop' and
+# create the .provider file there
+temp_dir=$(mktemp -d)
+# Develop the provider, this will let us run tests on it
+./manage.py develop -d $temp_dir
+# Set PROVIDERPATH (see plainbox(1)) so that we can see the provider
+# without installing it.
+export PROVIDERPATH=$PROVIDERPATH:$temp_dir
+# Run the 'normal' test plan
+plainbox run \
+    -T 2015.com.canonical.snapcraft::normal \
+    -f json -o $temp_dir/result.json
+# Analyze the result and fail if there are any failures
+python3 - << __PYTHON__
+import json
+with open("$temp_dir/result.json", "rt", encoding="utf-8") as stream:
+    results = json.load(stream)
+failed = False
+for test_id, result in sorted(results['result_map'].items()):
+    print('{0}: {1}'.format(test_id, result['outcome']))
+    if result['outcome'] != 'pass':
+        failed = True
+print("Overall: {0}".format("fail" if failed else "pass"))
+raise SystemExit(failed)
+__PYTHON__

=== modified file 'runtests.sh'
--- runtests.sh	2015-09-15 14:45:57 +0000
+++ runtests.sh	2015-09-17 15:07:57 +0000
@@ -69,39 +69,12 @@
         python3-coverage erase
         export PROJECT_PATH=$(pwd)
         export SNAPCRAFT=snapcraft-coverage
-    else
-        export SNAPCRAFT=snapcraft
     fi
 
     # Go to the plainbox provider of snapcraft tests
-    cd integration-tests/
-    # Create a temporary directory so that we can run 'manage.py develop' and
-    # create the .provider file there
-    temp_dir=$(mktemp -d)
-    # Develop the provider, this will let us run tests on it
-    ./manage.py develop -d $temp_dir
-    # Set PROVIDERPATH (see plainbox(1)) so that we can see the provider
-    # without installing it.
-    export PROVIDERPATH=$PROVIDERPATH:$temp_dir
-    # Run the 'normal' test plan
-    plainbox run \
-        -T 2015.com.canonical.snapcraft::normal \
-        -f json -o $temp_dir/result.json
-    # Analyze the result and fail if there are any failures
-    python3 - << __PYTHON__
-import json
-with open("$temp_dir/result.json", "rt", encoding="utf-8") as stream:
-    results = json.load(stream)
-failed = False
-for test_id, result in sorted(results['result_map'].items()):
-    print('{0}: {1}'.format(test_id, result['outcome']))
-    if result['outcome'] != 'pass':
-        failed = True
-print("Overall: {0}".format("fail" if failed else "pass"))
-raise SystemExit(failed)
-__PYTHON__
+    cd integration-tests
+    ./runtests.sh
 )
-
 fi
 
 if which python3-coverage >/dev/null 2>&1; then