Merge ~morphis/snappy-hwe-snaps/+git/pulseaudio:bug/enable-proposed into ~snappy-hwe-team/snappy-hwe-snaps/+git/se-test-tools:master

[Simon Fels]

Enable Ubuntu proposed archive within the classic snap for builds

As the current core snap is based on a systemd deb package from the Ubuntu Core image ppa we run into some conflicts with a newer one from the archive. To fix this issue we need to force upgrade to a newer systemd package from xenial proposed.

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:c755d8efbfba373d962c36edb6af99497c50b979
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/584/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/492/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/584/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

c755d8e... by Simon Fels on 2017-01-06

tests: upgrade classic system from proposed

a29ac2f... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-20

Version 8.0-3

c3e5e6e... by System Enablement CI Bot <email address hidden> on 2016-12-20

Merge remote tracking branch feature/fix-runtime-issues

Merge-Proposal: https://code.launchpad.net/~kzapalowicz/snappy-hwe-snaps/+git/pulseaudio/+merge/313340

0792791... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-20

Use stable channelm not candidate, for image building

ef3646b... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-20

Use stable channel for image creation

The Core image from th candidate channel hes problems in resolving the
dependencies for the pulseaudio snap. This forces the image to be
created out of the 'stable' channel which should not have this
problem

99ba403... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-20

Fix failing CI infrastructure due to broken packages

The CI is failing because libudev-dev is having the unmet dependencies.
This commit makes sure that the upgrade is performed before the snap
is build.

9268445... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-15

pulseaudio: fix the plug/slot connectin problem

The plugs and slots for pulseaudio snap cannot be connected w/o the
assertion which is a case when installing a locally build snap. This
change makes sure that the snap from the store is installed before
so that the connection is made.

60fd5cc... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-15

Add home plug for parec command

This commit adds home plug to the parec command so that it is possible
to play files from the ~ directory.

7a8251b... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-15

Add network plug

The network plug is needed to overcome SecComp complaining of
the unauthorized usage of the send system call.

d35ba51... by =?utf-8?q?Konrad_Zapa=C5=82owicz?= <email address hidden> on 2016-12-15

Decide to run the pa* scripts only as root

The pactl, parec and paplay commands, when run normally, try to access
/run/user/$USERID/ on Core which is disallowed by AppArmor rules.

This commit is make sure that the mentioned commands are run as root,
not regular user.

diff --git a/MAINTAINERS b/MAINTAINERS
index 170e9f4..b249add 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,2 +1,6 @@
+<<<<<<< MAINTAINERS
 Alfonso Sanchez-Beato <[e-mail]>
+=======
+Jim Hodapp <[e-mail]>
+>>>>>>> MAINTAINERS
 Simon Fels <[e-mail]>
diff --git a/README.md b/README.md
index 08d7a05..1cc87d3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< README.md
 # Test tools
 
 This snap bundles various tools needed from the test suites the
@@ -27,3 +28,8 @@ running them like
 ```
  $ se-test-tools.radvd -h
 ```
+=======
+# PulseAudio
+
+This is the snap to package the PulseAudio management service.
+>>>>>>> README.md
diff --git a/bin/config b/bin/config
new file mode 100755
index 0000000..86b115c
--- /dev/null
+++ b/bin/config
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 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/>.
+
+export PATH="$PATH:$SNAP/sbin"
+
+show_help() {
+	echo "Usage: $0 COMMAND..."
+	echo
+	echo "Commands:"
+	echo "    enable-debug       Enable verbose debugging."
+	echo "    disable-debug      Disable verbose debugging."
+}
+
+if [ "$1" = "" ]; then
+	show_help
+	exit
+fi
+
+while [ "$1" != '' ]; do
+	case "$1" in
+		--help)
+			show_help
+			exit
+			;;
+		enable-debug|disable-debug)
+			commands="$commands $1"
+			shift
+			;;
+		*)
+			echo "Unknown command: $1"
+			exit 1
+			;;
+	esac
+done
+
+if [ ! -d $SNAP_DATA/config ] ; then
+	mkdir $SNAP_DATA/config
+fi
+
+run_commands() {
+	while [ -n "$1" ]; do
+		case "$1" in
+			disable-debug)
+				if [ -e $SNAP_DATA/config/debug ] ; then
+					rm $SNAP_DATA/config/debug
+				fi
+				shift
+				;;
+			enable-debug)
+				touch $SNAP_DATA/config/debug
+				shift
+				;;
+		esac
+	done
+}
+
+run_commands $commands
diff --git a/bin/pactl b/bin/pactl
new file mode 100755
index 0000000..97e23b2
--- /dev/null
+++ b/bin/pactl
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 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/>.
+
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
+export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
+export HOME=$SNAP_DATA/home
+
+mkdir -p $HOME
+
+$SNAP/usr/bin/pactl $@
diff --git a/bin/paplay b/bin/paplay
new file mode 100755
index 0000000..a132d51
--- /dev/null
+++ b/bin/paplay
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 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/>.
+
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
+export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
+export HOME=$SNAP_DATA/home
+
+mkdir -p $HOME
+
+$SNAP/usr/bin/paplay $@
diff --git a/bin/parec b/bin/parec
new file mode 100755
index 0000000..269e0f8
--- /dev/null
+++ b/bin/parec
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 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/>.
+
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
+export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
+export HOME=$SNAP_DATA/home
+
+mkdir -p $HOME
+
+$SNAP/usr/bin/parec $@
diff --git a/bin/pulseaudio b/bin/pulseaudio
new file mode 100755
index 0000000..d9fb85f
--- /dev/null
+++ b/bin/pulseaudio
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+set -x
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
+export PULSE_STATE_PATH=$SNAP_DATA/state
+export ALSA_CONFIG_UCM=$SNAP/usr/share/alsa/ucm
+export ALSA_CONFIG_TPLG=$SNAP/usr/share/alsa/topology
+export ALSA_CONFIG_PATH=$SNAP/usr/share/alsa/alsa.conf
+export ALSA_MIXER_SIMPLE=$SNAP/usr/share/alsa/smixer.conf
+
+mkdir -p $PULSE_STATE_PATH
+
+EXTRA_ARGS=
+
+if [ -e $SNAP_DATA/config/debug ] ; then
+    EXTRA_ARGS="$EXTRA_ARGS -vvvv"
+	export LIBASOUND_DEBUG=1
+fi
+
+$SNAP/usr/bin/pulseaudio \
+    --exit-idle-time=-1 \
+    --disallow-exit=yes \
+    --system \
+    -F $SNAP/etc/pulse/default.pa \
+    -p $SNAP/usr/lib/pulse-8.0/modules \
+    -n \
+    $EXTRA_ARGS
diff --git a/data/copyright b/data/copyright
new file mode 100644
index 0000000..970053b
--- /dev/null
+++ b/data/copyright
@@ -0,0 +1,604 @@
+This package was debianized by CJ van den Berg <[e-mail]> on
+Thu, 10 Aug 2006 15:59:43 +0200.
+
+It was downloaded from <http://pulseaudio.org/wiki/DownloadPulseAudio>.
+
+ Upstream Authors
+ ================
+
+ Lennart Poettering <[e-mail]>
+ Pierre Ossman <[e-mail]>,
+     through his employer Cendio <http://www.cendio.com/>
+
+Files: *
+Copyright:
+  Copyright (C) 2004-2009 Lennart Poettering
+  Copyright (C) 2006-2007 Pierre Ossman <[e-mail]> for Cendio AB
+License: LGPL-2.1+
+ The upstream license clarifies pretty well that the sources of pulseaudio are
+ LGPL (please see LGPL license grant below), but that some parts will be
+ effectively GPL since they rely on GPL libraries, quoting the upstream
+ LICENSE:
+
+    """All PulseAudio source files are licensed under the GNU Lesser General
+    Public License. (see file LGPL for details)
+
+    However, the server side links to the GPL-only library 'libsamplerate'
+    which practically downgrades the license of the server part to GPL (see
+    file GPL for details), exercising section 3 of the LGPL.
+
+    Hence you should treat the client library ('libpulse') of PulseAudio as
+    being LGPL licensed and the server part ('libpulsecore') as being GPL
+    licensed. Since the PulseAudio daemon and the modules link to
+    'libpulsecore' they are of course also GPL licensed.
+
+    -- Lennart Poettering, April 20th, 2006."""
+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+  /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/g711.c
+Copyright:
+ Copyright (C) Sun Microsystems, Inc
+License:
+ This source code is a product of Sun Microsystems, Inc. and is provided
+ for unrestricted use.  Users may copy or modify this source code without
+ charge.
+
+ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+
+ Sun source code is provided with no support and without any obligation on
+ the part of Sun Microsystems, Inc. to assist in its use, correction,
+ modification or enhancement.
+
+ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ OR ANY PART THEREOF.
+
+ In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ or profits or other special, indirect and consequential damages, even if
+ Sun has been advised of the possibility of such damages.
+
+Files: src/pulsecore/g711.h
+Copyright:
+ Copyright (C) 2001 Chris Bagwell
+Licence:
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.  This software is provided "as is" without express or
+ implied warranty.
+
+Files: src/pulsecore/poll.*
+Copyright:
+ Copyright 2006 Pierre Ossman <[e-mail]> for Cendio AB
+ Copyright (C)1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulse/utf8.c
+Copyright:
+ Copyright (C) 1999 Tom Tromey
+ Copyright (C) 2000 Red Hat, Inc.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/bluetooth/ipc.*, src/modules/bluetooth/rtp.*
+Copyright:
+ Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/bluetooth/module-bluetooth-{device,discover}.c,
+       src/modules/bluetooth/bluetooth-util.*
+Copyright:
+ Copyright (C) 2008-2009 Joao Paulo Rechi Vita
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.
+
+File: src/modules/bluetooth/proximity-helper.c
+Copyright:
+ Copyright (C) 2000-2001  Qualcomm Incorporated
+ Copyright (C) 2002-2003  Maxim Krasnyansky <[e-mail]>
+ Copyright (C) 2002-2007  Marcel Holtmann <[e-mail]>
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: src/modules/bluetooth/sbc*
+Copyright:
+ Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+ Copyright (C) 2004-2005  Henryk Ploetz <[e-mail]>
+ Copyright (C) 2005-2006  Brad Midgley <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/dbus/iface-{client,stream}.c:
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+ Copyright 2009 Vincent Filali-Ansary <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/dbus/module-dbus-protocol.c
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Shams E. King
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/dbus/*
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/echo-cancel/adrian*.*
+Copyright:
+ Copyright (C) DFS Deutsche Flugsicherung (2004). All Rights Reserved.
+License:
+ You are allowed to use this source code in any open source or closed
+ source software you want. You are allowed to use the algorithms for a
+ hardware solution. You are allowed to modify the source code.
+ You are not allowed to remove the name of the author from this memo or
+ from the source code files. You are not allowed to monopolize the
+ source code or the algorithms behind the source code as your
+ intellectual property. This source code is free of royalty and comes
+ with no warranty.
+
+File: src/modules/echo-cancel/echo-cancel.h
+Copyright:
+ Copyright 2010 Arun Raghavan <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/echo-cancel/module-echo-cancel.c
+Copyright:
+ Copyright 2010 Wim Taymans <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/echo-cancel/speex.c
+Copyright:
+ Copyright 2010 Wim Taymans <[e-mail]>
+ Contributor: Arun Raghavan <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/jack/module-jackdbus-detect.c
+Copyright:
+ Written by David Henningsson <[e-mail]>
+ Copyright 2010 Canonical Ltd.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-device-manager.*
+Copyright:
+ Copyright 2006-2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/module-equalizer-sink.c
+Copyright:
+ Copyright 2004-2008 Lennart Poettering
+ Copyright 2009 Jason Newton <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulsecore/dbus-*.*, src/modules/module-hal-detect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Shams E. King
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/ladspa.h
+Copyright:
+ Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan
+   Westerfeld.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-always-sink.c, src/modules/rtp/rtsp_client.*
+Copyright:
+ Copyright (C) 2008 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-detect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <[e-mail]> for Cendio AB
+ Copyright 2006 Diego Petteno
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/roap/*roap*, src/modules/rtp/headerlist.*
+Copyright:
+ Copyright 2005-2007 Lennart Poettering
+ Copyright (C) 2008 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/roap/base64.*
+Copyright:
+ Copyright (C) 2008 Colin Guthrie
+ Copyright (C) Kungliga Tekniska Hogskolan
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-device-manager.c
+Copyright:
+ Copyright 2006-2008 Lennart Poettering
+ Copyright 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-filter-{apply,heuristics}*.c
+Copyright:
+ Copyright 2011 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-solaris.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2006-2007 Pierre Ossman <[e-mail]> for Cendio AB
+ Copyright 2009 Finn Thain
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/module-switch-on-connect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2009 Canonical Ltd
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-virtual-s{ink,ource}.c
+Copyright:
+ Copyright 2010 Intel Corporation
+ Contributor: Pierre-Louis Bossart <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/reserve.*
+Copyright:
+  Copyright 2009 (C) Lennart Poettering
+License:
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+Files: src/pulsecore/atomic.h
+Copyright:
+ Copyright (C) 2006-2008 Lennart Poettering
+ Copyright (C) 2008 Nokia Corporation
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/core-util.c
+Copyright:
+ Copyright (C) 2004-2006 Lennart Poettering
+ Copyright (C) 2004 Joe Marcus Clarke
+ Copyright (C) 2006-2007 Pierre Ossman <[e-mail]> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/pulse/ext-device-manager.*
+Copyright:
+ Copyright (C) 2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/ffmpeg/avcodec.h
+Copyright:
+ Copyright (c) 2001 Fabrice Bellard
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/ffmpeg/resample2.c
+Copyright:
+ Copyright (c) 2004 Michael Niedermayer <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/pulsecore/socket-util.c
+Copyright:
+ Copyright (C) 2004-2006 Lennart Poettering
+ Copyright (C) 2004 Joe Marcus Clarke
+ Copyright (C) 2006-2007 Pierre Ossman <[e-mail]> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: man/xmltoman
+Copyright:
+  Copyright (C) 2000-2002 Oliver Kurth <[e-mail]>
+  Copyright (C) 2003 Lennart Poettering <[e-mail]>
+License: LGPL-2+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.
+
+File: po/ca.po
+Copyright:
+  Copyright (C) 2008 Xavier Conde Rueda <[e-mail]>
+  Copyright (C) 2009 Agustí Grau <[e-mail]>, 2009.
+  Copyright (C) Judith Pintó Subirada <[e-mail]>
+  Copyright (C) 2009 Josep Torné Llavall <[e-mail]>
+
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/cs.po
+Copyright:
+  Copyright (C) 2008,2009 Petr Kovar <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/de.po
+Copyright:
+  Copyright (C) 2008,2009 Fabian Affolter <[e-mail]>
+  Copyright (C) 2008,2009 Micha Pietsch <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/de_CH.po
+Copyright:
+  Copyright (C) 2008, 2009 Fabian Affolter <[e-mail]>
+  Copyright (C) 2008, 2009 Micha Pietsch <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/el.po
+Copyright:
+  Copyright (C) 2008 Dimitris Glezos <[e-mail]>
+  Copyright (C) 2009 Thalia Papoutsaki <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/es.po
+Copyright:
+  Copyright (C) 2009 Domingo Becker <[e-mail]>
+  Copyright (C) 2008 Hector Daniel Cabrera <[e-mail]>
+  Copyright (C) 2009 Fernando Gonzalez Blanco <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/fi.po
+Copyright:
+  Copyright (C) 2009 Timo Jyrinki <[e-mail]>
+  Copyright (C) 2009 Ville-Pekka Vainio <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/fr.po
+Copyright:
+  Copyright (C) 2008 Robert-Andre Mauchin <[e-mail]>
+  Copyright (C) 2008 Michael Ughetto <telimektar esraonline com>
+  Copyright (C) 2008 Pablo Martin-Gomez <[e-mail]>
+  Copyright (C) 2009 Corentin Perard <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/gu.po
+Copyright:
+  Copyright (C) 2009 Sweta Kothari <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/hi.po
+Copyright:
+  Copyright (C) 2009 Rajesh Ranjan <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/it.po
+Copyright:
+  Copyright (C) 2008,2009 Luca Ferretti <[e-mail]>
+  Copyright (C) 2009 Milo Casagrande <[e-mail]>
+  Copyright (C) 2009 ario_santagiuliana <mario at marionline.it>
+  Copyright (C) 2009 Milo Casagrande <[e-mail]>
+
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/ja.po
+Copyright:
+  Copyright (C) 2009 Hyu_gabaru Ryu_ichi <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/kn.po
+Copyright:
+  Copyright (C) 2009 Shankar Prasad <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/mr.po
+Copyright:
+  Copyright (C) 2009 Sandeep Shedmake <[e-mail]>
+  Copyright (C) 2009 Sandeep Shedmake <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/nl.po
+Copyright:
+  Copyright (C) 2009 Geert Warrink <[e-mail]>
+  Copyright (C) 2009 Reinout van Schouwen <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/or.po
+Copyright:
+  Copyright (C) 2009 Manoj Kumar Giri <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pa.po
+Copyright:
+  Copyright (C) 2009 Amanpreet Singh Alam <[e-mail]>
+  Copyright (C) 2009 Jaswinder Singh <[e-mail]>
+  Copyright (C) 2009 A S Alam <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pl.po
+Copyright:
+  Copyright (C) 2008 Piotr Drag <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/pt_BR.po
+Copyright:
+  Copyright (C) 2008 Fabian Affolter <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/sr.po, po/[e-mail]
+Copyright:
+  Copyright (C) 2009 Igor Miletic (Игор Милетић) <[e-mail]>, 2009.
+  Copyright (C) 2009 Miloš Komarčević <[e-mail]>, 2009.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/sv.po
+Copyright:
+  Copyright (C) 2008 Daniel Nylander <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/ta.po
+Copyright:
+  Copyright (C) 2009 I. Felix <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/te.po
+Copyright:
+  Copyright (C) 2009 Krishna Babu K <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/uk.po
+Copyright:
+  Copyright (C) 2009 Yuri Chornoivan <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: po/zh_CN.po
+Copyright:
+  Copyright (C) 2008 闫丰刚 (sainry)<[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: debian/*
+Copyright:
+  Copyright 2006-2009 Sjoerd Simons <[e-mail]>
+  Copyright 2006-2008 CJ van den Berg <[e-mail]>
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+  /usr/share/common-licenses/GPL-2.
+
+Files: src/pulsecore/cpu-*, src/pulsecore/remap*,
+       src/pulsecore/svolume_{arm,mmx,sse}.c
+Copyright:
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2009 Wim Taymans <[e-mail]>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+
+Files: src/pulsecore/sconv_sse.c
+Copyright:
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <[e-mail]> for Cendio AB
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+
+Files: src/pulsecore/usergroup.*
+Copyright:
+  Copyright 2009 Ted Percival
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
diff --git a/run-tests.sh b/run-tests.sh
new file mode 100755
index 0000000..b4ce91b
--- /dev/null
+++ b/run-tests.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 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 -ex
+
+image_name=ubuntu-core-16.img
+channel=stable
+spread_opts=
+force_new_image=0
+test_from_channel=0
+
+show_help() {
+    echo "Usage: run-tests.sh [OPTIONS]"
+    echo
+    echo "optional arguments:"
+    echo "  --help                 Show this help message and exit"
+    echo "  --channel=<channel>    Select another channel to build the base image from (default: $channel)"
+    echo "  --debug                Enable verbose debugging output"
+    echo "  --test-from-channel    Pull snap from the specified channel instead of building it from source"
+    echo "  --force-new-image      Force generating a new image used for testing"
+}
+
+while [ -n "$1" ]; do
+	case "$1" in
+		--help)
+			show_help
+			exit
+			;;
+		--channel=*)
+			channel=${1#*=}
+			shift
+			;;
+		--test-from-channel)
+			test_from_channel=1
+			shift
+			;;
+		--debug)
+			spread_opts="$spread_opts -vv -debug"
+			shift
+			;;
+		--force-new-image)
+			force_new_image=1
+			shift
+			;;
+		*)
+			echo "Unknown command: $1"
+			exit 1
+			;;
+	esac
+done
+
+SPREAD_QEMU_PATH="$HOME/.spread/qemu"
+if [ `which spread` = /snap/bin/spread ] ; then
+	current_version=`readlink /snap/spread/current`
+	SPREAD_QEMU_PATH="$HOME/snap/spread/$current_version/.spread/qemu/"
+fi
+
+# Make sure we have a base image we use for testing
+if [ ! -e $SPREAD_QEMU_PATH/$image_name ] || [ $force_new_image -eq 1 ] ; then
+	echo "INFO: Creating new qemu test image ..."
+	(cd tests/image ; sudo ./create-image.sh $channel)
+	mkdir -p $SPREAD_QEMU_PATH
+	mv tests/image/ubuntu-core-16.img $SPREAD_QEMU_PATH/$image_name
+fi
+
+# We currently only run spread tests but we could do other things
+# here as well like running our snap-lintian tool etc.
+if [ $test_from_channel -eq 1 ] ; then
+	export SNAP_CHANNEL=$channel
+fi
+spread $spread_opts
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c121988..ab7d560 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,13 +1,27 @@
+<<<<<<< snapcraft.yaml
 name: se-test-tools
 summary: A set of tools used for testing
 description: |
   This snap contains a few tools used for automated testing in the
   System Enablement team of Canonical.
 version: 2
+=======
+name: pulseaudio
+version: 8.0-3
+summary: PulseAudio sound server
+description: |
+  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+  WIN32 systems. It is a drop in replacement for the ESD sound server with
+  much better latency, mixing/re-sampling quality and overall architecture.
+
+  Please find the source code for this snap at:
+  https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+>>>>>>> snapcraft.yaml
 grade: stable
 confinement: strict
 
 apps:
+<<<<<<< snapcraft.yaml
   radvd:
     command: usr/sbin/radvd
     plugs:
@@ -41,3 +55,141 @@ parts:
       - isc-dhcp-server
       - ethtool
       - inotify-tools
+=======
+  pulseaudio:
+    command: bin/pulseaudio
+    daemon: simple
+    slots: [service]
+  pactl:
+    command: bin/pactl
+    plugs: [client, network]
+  paplay:
+    command: bin/paplay
+    plugs: [client, home, network]
+  parec:
+    command: bin/parec
+    plugs: [client, home, network]
+  config:
+    command: bin/config
+
+slots:
+  service:
+    interface: pulseaudio
+
+plugs:
+  client:
+    interface: pulseaudio
+
+parts:
+  pulseaudio-common:
+    plugin: copy
+    files:
+      bin/pulseaudio: bin/pulseaudio
+      bin/pactl: bin/pactl
+      bin/paplay: bin/paplay
+      bin/parec: bin/parec
+      bin/config: bin/config
+      data/copyright: usr/share/doc/pulseaudio/copyright
+
+  alsa-lib:
+    plugin: autotools
+
+    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+    source-type: git
+    source-branch: alsa-lib/xenial/1.1.0
+
+    configflags:
+      - --prefix=/usr
+      - --sysconfdir=/etc
+      - --libexec=/usr/lib
+      - --libdir=/usr/lib
+      - --localstatedir=/var
+      - --with-plugindir=/usr/lib/alsa-lib
+      - --disable-silent-rules
+      - --disable-static
+      - --disable-python
+
+    filesets:
+      libasound2:
+        - usr/lib/libasound.so*
+        - usr/lib/alsa-lib/*
+        - usr/share/alsa/*
+
+    snap:
+      - $libasound2
+
+
+  pulseaudio:
+    after:
+      - alsa-lib
+
+    plugin: autotools
+
+    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+    source-type: git
+    source-branch: pulseaudio/8.0
+
+    build-packages:
+      - intltool
+      - libasound2-dev
+      - libdbus-1-dev
+      - libjson-c-dev
+      - libglib2.0-dev
+      - libspeexdsp-dev
+      - libbluetooth-dev
+      - libwebrtc-audio-processing-dev
+      - libltdl-dev
+      - libsndfile1-dev
+      - libx11-xcb-dev
+      - libx11-dev
+      - libtdb-dev
+      - libudev-dev
+      - libasyncns-dev
+      - libxcb1-dev
+
+    configflags:
+      - --prefix=/usr
+      - --sysconfdir=/etc
+      - --libexec=/usr/lib
+      - --libdir=/usr/lib
+      - --localstatedir=/var
+      - --enable-udev
+      - --disable-rpath
+      - --disable-orc
+      - --disable-gconf
+      - --disable-bluez4
+      - --disable-bluez5
+      - --disable-esound
+      - --disable-adrian-aec
+      - --disable-gtk3
+      - --disable-hal-compat
+      - --disable-systemd-login
+      - --without-caps
+      - --disable-webrtc-aec
+      - --disable-dbus
+      - --disable-oss-output
+      - --disable-oss-wrapper
+      - --disable-jack
+      - --disable-x11
+      - --with-system-user=root
+      - --with-system-group=root
+
+    filesets:
+      pauseaudiofiles:
+        - etc/*
+        - lib/*
+        - usr/bin/pacat
+        - usr/bin/pactl
+        - usr/bin/paplay
+        - usr/bin/parec
+        - usr/bin/pulseaudio
+        - usr/lib/libpulse-mainloop-glib.so*
+        - usr/lib/libpulse-simple.so*
+        - usr/lib/libpulse.so*
+        - usr/lib/pulse-8.0/*
+        - usr/lib/pulseaudio/*.so
+        - usr/share/pulseaudio/*
+
+    snap:
+      - $pauseaudiofiles
+>>>>>>> snapcraft.yaml
diff --git a/spread.yaml b/spread.yaml
new file mode 100644
index 0000000..0c615ba
--- /dev/null
+++ b/spread.yaml
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2016 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/>.
+
+project: pulseaudio
+
+environment:
+    PROJECT_PATH: /home/pulseaudio
+    TESTSLIB: $PROJECT_PATH/tests/lib
+    SNAP_NAME: pulseaudio
+    # Allow the host to pass the channel to use for the test run
+    SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
+
+backends:
+    qemu:
+        systems:
+            - ubuntu-core-16:
+                username: test
+                password: test
+
+# Put this somewhere where we have read-write access
+path: /home/pulseaudio
+
+exclude:
+  - .git
+
+prepare: |
+  . $TESTSLIB/prepare-all.sh
+
+suites:
+    tests/main/:
+        summary: Full-system tests for PulseAudio
+        systems:
+            - ubuntu-core-16
+        prepare: |
+            . $TESTSLIB/prepare.sh
+        restore-each: |
+            . $TESTSLIB/restore-each.sh
+
diff --git a/tests/image/README.md b/tests/image/README.md
new file mode 100644
index 0000000..b75b66e
--- /dev/null
+++ b/tests/image/README.md
@@ -0,0 +1,7 @@
+# Generate user password
+
+You can generate the password for the system user assertion via
+
+```
+ $ python3 -c 'import crypt; print(crypt.crypt("test", crypt.mksalt(crypt.METHOD_SHA512)))'
+```
diff --git a/tests/image/create-image.sh b/tests/image/create-image.sh
new file mode 100755
index 0000000..3aa1d13
--- /dev/null
+++ b/tests/image/create-image.sh
@@ -0,0 +1,157 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 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 [ $(id -u) -ne 0 ] ; then
+	echo "ERROR: needs to be executed as root"
+	exit 1
+fi
+
+channel=stable
+if [ ! -z "$1" ] ; then
+	channel=$1
+fi
+
+snap=
+if [ ! -z "$2" ] ; then
+	snap=$2
+fi
+
+model=pc
+arch=amd64
+image_name=ubuntu-core-16.img
+ubuntu_image_extra_args=
+
+if [ ! -z "$snap" ] ; then
+	ubuntu_image_extra_args="--extra-snaps $snap"
+fi
+
+ubuntu-image \
+	--channel $channel \
+	-o $image_name \
+	--image-size 4G \
+	$ubuntu_image_extra_args \
+	$model.model
+
+kpartx -a $image_name
+sleep 0.5
+
+loop_path=`findfs LABEL=writable`
+tmp_mount=`mktemp -d`
+
+mount $loop_path $tmp_mount
+
+# Migrate all systemd units from core snap into the writable area. This
+# would be normally done on firstboot by the initramfs but we can't rely
+# on that because we  are adding another file in there and that will
+# prevent the initramfs from transitioning any files.
+core_snap=$(find $tmp_mount/system-data/var/lib/snapd/snaps -name "core_*.snap")
+tmp_core=`mktemp -d`
+mount $core_snap $tmp_core
+mkdir -p $tmp_mount/system-data/etc/systemd
+cp -rav $tmp_core/etc/systemd/* \
+	$tmp_mount/system-data/etc/systemd/
+umount $tmp_core
+rm -rf $tmp_core
+
+# system-user assertion which gives us our test:test user we use to
+# log into the system
+mkdir -p $tmp_mount/system-data/var/lib/snapd/seed/assertions
+cp test-user.assertion $tmp_mount/system-data/var/lib/snapd/seed/assertions
+
+# Disable console-conf for the first boot
+mkdir -p $tmp_mount/system-data/var/lib/console-conf/
+touch $tmp_mount/system-data/var/lib/console-conf/complete
+
+# Create systemd service which is running on firstboot and sets up
+# various things for us.
+mkdir -p $tmp_mount/system-data/etc/systemd/system
+cat << 'EOF' > $tmp_mount/system-data/etc/systemd/system/devmode-firstboot.service
+[Unit]
+Description=Run devmode firstboot setup
+After=snapd.service snapd.socket
+
+[Service]
+Type=oneshot
+ExecStart=/writable/system-data/var/lib/devmode-firstboot/run.sh
+RemainAfterExit=yes
+TimeoutSec=3min
+EOF
+
+mkdir -p $tmp_mount/system-data/etc/systemd/system/multi-user.target.wants
+ln -sf /etc/systemd/system/devmode-firstboot.service \
+	$tmp_mount/system-data/etc/systemd/system/multi-user.target.wants/devmode-firstboot.service
+
+mkdir $tmp_mount/system-data/var/lib/devmode-firstboot
+cat << EOF > $tmp_mount/system-data/var/lib/devmode-firstboot/00-snapd-config.yaml
+network:
+  version: 2
+  ethernets:
+    eth0:
+      dhcp4: true
+EOF
+
+cat << 'EOF' > $tmp_mount/system-data/var/lib/devmode-firstboot/run.sh
+#!/bin/bash
+
+set -e
+
+# Don't start again if we're already done
+if [ -e /writable/system-data/var/lib/devmode-firstboot/complete ] ; then
+	exit 0
+fi
+
+echo "Start devmode-firstboot $(date -Iseconds --utc)"
+
+if [ "$(snap managed)" = "true" ]; then
+	echo "System already managed, exiting"
+	exit 0
+fi
+
+# no changes at all
+while ! snap changes ; do
+	echo "No changes yet, waiting"
+	sleep 1
+done
+
+while snap changes | grep -qE '(Do|Doing) .*Initialize system state' ;  do
+	echo "Initialize system state is in progress, waiting"
+	sleep 1
+done
+
+if [ -n "$(snap known system-user)" ]; then
+	echo "Trying to create known user"
+	snap create-user --known --sudoer
+fi
+
+cp /writable/system-data/var/lib/devmode-firstboot/00-snapd-config.yaml /writable/system-data/etc/netplan
+
+# Enable console-conf again
+rm /writable/system-data/var/lib/console-conf/complete
+
+# Mark us done
+touch /writable/system-data/var/lib/devmode-firstboot/complete
+
+# Reboot the system as its now prepared for the user
+reboot
+EOF
+
+chmod +x $tmp_mount/system-data/var/lib/devmode-firstboot/run.sh
+
+umount $tmp_mount
+kpartx -d $image_name
+rm -rf $tmp_mount
diff --git a/tests/image/pc-model.json b/tests/image/pc-model.json
new file mode 100644
index 0000000..2eb1411
--- /dev/null
+++ b/tests/image/pc-model.json
@@ -0,0 +1,11 @@
+{
+  "type": "model",
+  "authority-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
+  "brand-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
+  "series": "16",
+  "model": "pc",
+  "architecture": "amd64",
+  "gadget": "pc",
+  "kernel": "pc-kernel",
+  "timestamp": "2016-09-09T08:27:36+00:00"
+}
diff --git a/tests/image/pc.model b/tests/image/pc.model
new file mode 100644
index 0000000..345b7e4
--- /dev/null
+++ b/tests/image/pc.model
@@ -0,0 +1,21 @@
+type: model
+authority-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+series: 16
+brand-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+model: pc
+architecture: amd64
+gadget: pc
+kernel: pc-kernel
+timestamp: 2016-09-09T08:27:36+00:00
+sign-key-sha3-384: a4qX7md6GQGNcZc_cmWPBStTq4RNCnGTzF-4usF5wFylQ-xZQej-SD6prx8Yl89O
+
+AcLBXAQAAQoABgUCWBBNTwAKCRAVoE002xqmOPH/EACWLf1UeZgICjNbzLI5bO/84LExS8iUjarG
+S7DRn8Ln5zu44pxz7UXJNjULgnU8yuKVPVWg0ij7DRvaj8tGxOMMAls1fjSRtEYR8oJFsI3jXDGw
+cLjvJG/crUxV8DgdZFlF02Kb5VtmNDXs1OE3zpPeniG19JYHaf2hDz4SRmWZe4c2MFrAt2UwI/VC
+o/209Fl3qA8p8x5EYOBycgHooHm3924NTF9mXbKSfLRgGS7YzmN4FXFyiGOTY6CRsp37XnkxGcA1
++lyZz1X97qT/fOGVUFqHDqUZmuCs5sC3+DNonytTgKt5+7S+V+Ai45HEayD5f4gS9uscnTMTwEEJ
+VgSZRU0My+iJwFlXHaGWQe9eC37YCZ3ahBxc2SpkFffXjYhEMtTtr1vDIYCAhbc2k8aa3hPE2GUg
+3pv8zs1AuZzSVX+Rp4ysMBqU23UUVP6Bmvr7ZD3E8aEUxE6O/BEA10Km5oZPqpmBfcEVO8a0yZjn
+YQxn4XzY1Nwq1d0sJIV7FEDsq9dXH9QCa4qsCH3KG3jHv32GapvLf8mpr6HSH+JmPM5kNeVugLVy
+/RUAFNu+Y4hqhpRNC8fc+UDkVBXsLDqHb5gfXnhbFIH8LvpVFR20SSkg9/Km5xC+7wcey0h8SD6/
+Eh70OPLxDkzitEn/1L/0V987dlJnhS4WpqrYfbHYwQ==
diff --git a/tests/image/test-user-assertion.json b/tests/image/test-user-assertion.json
new file mode 100644
index 0000000..81f6beb
--- /dev/null
+++ b/tests/image/test-user-assertion.json
@@ -0,0 +1,13 @@
+{
+  "type": "system-user",
+  "authority-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
+  "brand-id": "4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf",
+  "series": ["16"],
+  "models": ["pc"],
+  "name": "Default Test User",
+  "username": "test",
+  "email": "test@localhost",
+  "password": "$6$OCvKy4w/Ppxp7IvC$WPzWiIW.4y18h9htjbOuxLZ.sjQ5M2hoSiEu3FpMU0PMdHQuQdBOqvk8p6DMdS/R/nU/rXidClD23CbSkSgp30",
+  "since": "2016-10-24T07:12:10+00:00",
+  "until": "2017-10-24T07:12:10+00:00"
+}
diff --git a/tests/image/test-user.assertion b/tests/image/test-user.assertion
new file mode 100644
index 0000000..7ebb667
--- /dev/null
+++ b/tests/image/test-user.assertion
@@ -0,0 +1,25 @@
+type: system-user
+authority-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+brand-id: 4BKZlf4WMNBKgQfij0rftmp5BzDdVhlf
+email: test@localhost
+models:
+  - pc
+name: Default Test User
+password: $6$OCvKy4w/Ppxp7IvC$WPzWiIW.4y18h9htjbOuxLZ.sjQ5M2hoSiEu3FpMU0PMdHQuQdBOqvk8p6DMdS/R/nU/rXidClD23CbSkSgp30
+series:
+  - 16
+since: 2016-10-24T07:12:10+00:00
+until: 2017-10-24T07:12:10+00:00
+username: test
+sign-key-sha3-384: a4qX7md6GQGNcZc_cmWPBStTq4RNCnGTzF-4usF5wFylQ-xZQej-SD6prx8Yl89O
+
+AcLBXAQAAQoABgUCWBBOJAAKCRAVoE002xqmOKaRD/0cEKWb2nbwhk+BTgOrYZHrwzjbIWTZznDh
+xCD6JWF/yr9br1vEmRz2zCNPPWZgFH9HaJ+mT/lktWIs7VVMIdwMDWYOR8P9rdWM/Jx6iyB3z0OI
+YO31zaU4XLyolv/YSj/nFXMMD+jIeE4l8j4AtCSJwd7ZS9Jz8F/RfrD8EpG0JU1F55lq8MC0mjZ4
+ul5ws8k9UiP8nA5IAG30NvvReiUGYqtdkO43eQmy88WABL95MbFsbfEk4/VduG0Gt3y/T8vDDcF6
+NJEm8L+O9IXnPBAje0Ve0NX3YtOE3CDTkYRKR7xFFJq2cJVCSvf9CsorREg4KyfagIdMKDSa5Tiq
+FzoAJTfI0ltq5cAnLImtxFKulJ+AnGUNMLrKFr1H0FGtqTZBfs/PcIxy0qY0YDXSF4/9F2PUBdQS
+tSmN6pT9t1FCGy2Rf5n3QV4e0R2JzS6Kx+vdbPMYqhssQosLU5GwlWj8UbevtphAGf8u8nLBDYWs
+MNIPi0IrPmzIewZBD05A6a8T+oHZ9dIg5SAnJ4gmz0sCzNDKarvYqLpcU1rZzu78/UypbHXDvBAt
+gnxYpD6WHR2aHSeyx3WvOp130jFco2/55M0RTEm50isO1uv2DqTn9ULkBdCrG/zOqEmZgY18ds3P
+yTaAbaIAqUe7scpAHY0a31tfnXq8cRyEX03e9g2Mrg==
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
new file mode 100644
index 0000000..e53efb4
--- /dev/null
+++ b/tests/lib/prepare-all.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# We don't have to build a snap when we should use one from a
+# channel
+if [ -n "$SNAP_CHANNEL" ] ; then
+	exit 0
+fi
+
+# Setup classic snap and build the pulseaudio snap in there
+snap install --devmode --beta classic
+cat <<-EOF > /home/test/build-snap.sh
+#!/bin/sh
+set -ex
+
+# FIXME: Enable propose for now until problems with conflicting systemd
+# packages between the Ubuntu Core image ppa and the archive are fixed.
+echo "deb http://archive.ubuntu.com/ubuntu/ xenial-proposed restricted main universe" > /etc/apt/sources.list.d/ubuntu-proposed.list
+
+# Ensure we have the latest updates installed as the core snap
+# may be a bit out of date.
+apt update
+apt upgrade --yes --force-yes
+
+apt install -y --force-yes snapcraft
+cd /home/pulseaudio
+snapcraft clean
+snapcraft
+EOF
+
+chmod +x /home/test/build-snap.sh
+sudo classic /home/test/build-snap.sh
+snap remove classic
+
+# Make sure we have a snap build
+test -e /home/pulseaudio/pulseaudio_*_amd64.snap
diff --git a/tests/lib/prepare-each.sh b/tests/lib/prepare-each.sh
new file mode 100644
index 0000000..de6816d
--- /dev/null
+++ b/tests/lib/prepare-each.sh
@@ -0,0 +1,6 @@
+SNAP_INSTALL_OPTS=
+if [ -n "$SNAP_CHANNEL" ] ; then
+	SNAP_INSTALL_OPTS="--$SNAP_CHANNEL"
+fi
+
+snap install $SNAP_INSTALL_OPTS $SNAP_NAME
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
new file mode 100644
index 0000000..60a45e9
--- /dev/null
+++ b/tests/lib/prepare.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+echo "Wait for firstboot change to be ready"
+while ! snap changes | grep -q "Done"; do
+	snap changes || true
+	snap change 1 || true
+	sleep 1
+done
+
+echo "Ensure fundamental snaps are still present"
+. $TESTSLIB/snap-names.sh
+for name in $gadget_name $kernel_name $core_name; do
+	if ! snap list | grep -q $name ; then
+		echo "Not all fundamental snaps are available, all-snap image not valid"
+		echo "Currently installed snaps:"
+		snap list
+		exit 1
+	fi
+done
+
+echo "Kernel has a store revision"
+snap list | grep ^${kernel_name} | grep -E " [0-9]+\s+canonical"
+
+# If we don't install pulseaudio here we get a system
+# without any network connectivity after reboot.
+if [ -n "$SNAP_CHANNEL" ] ; then
+	# Don't reinstall if we have it installed already
+	if ! snap list | grep pulseaudio ; then
+		snap install --$SNAP_CHANNEL pulseaudio
+	fi
+	echo "USING-CHANNEL"
+else
+	echo "INSTALLING-PULSEAUDIO-SNAP"
+        # Install prebuilt pulseaudio snap but first install if from
+	# the store to work around the fact that we are not allowed
+	# anymore to connect pulseaudio slot to a snap installed with
+	# --dangerous
+	snap install --beta pulseaudio
+	snap install --dangerous /home/pulseaudio/pulseaudio_*_amd64.snap
+fi
+
+# Snapshot of the current snapd state for a later restore
+if [ ! -f $SPREAD_PATH/snapd-state.tar.gz ] ; then
+	systemctl stop snapd.service snapd.socket
+	tar czf $SPREAD_PATH/snapd-state.tar.gz /var/lib/snapd
+	systemctl start snapd.socket
+fi
+
+# For debugging dump all snaps and connected slots/plugs
+snap list
+snap interfaces
diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
new file mode 100644
index 0000000..541ba8c
--- /dev/null
+++ b/tests/lib/restore-each.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. $TESTSLIB/snap-names.sh
+
+# Remove all snaps not being the core, gadget, kernel or snap we're testing
+for snap in /snap/*; do
+	snap="${snap:6}"
+	case "$snap" in
+		"bin" | "$gadget_name" | "$kernel_name" | "$core_name" | "$SNAP_NAME")
+			;;
+		*)
+			snap remove "$snap"
+			;;
+	esac
+done
+
+# Ensure we have the same state for snapd as we had before
+systemctl stop snapd.service snapd.socket
+rm -rf /var/lib/snapd/*
+tar xzf $SPREAD_PATH/snapd-state.tar.gz -C /
+rm -rf /root/.snap
+systemctl start snapd.service snapd.socket
diff --git a/tests/lib/snap-names.sh b/tests/lib/snap-names.sh
new file mode 100644
index 0000000..f15b09a
--- /dev/null
+++ b/tests/lib/snap-names.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+gadget_name=$(snap list | sed -n 's/^\(pc\|pi[23]\|dragonboard\) .*/\1/p')
+kernel_name=$gadget_name-kernel
+core_name=$(snap list | awk '/^(ubuntu-)?core / {print $1; exit}')
+if [ "$kernel_name" = "pi3-kernel" ] ; then
+	kernel_name=pi2-kernel
+fi
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
new file mode 100644
index 0000000..977d045
--- /dev/null
+++ b/tests/lib/utilities.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+wait_for_pulseaudio() {
+	while ! systemctl status snap.pulseaudio.pulseaudio ; do
+		sleep 1
+	done
+	sleep 1
+}
+
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
new file mode 100644
index 0000000..2d9fb0d
--- /dev/null
+++ b/tests/main/installation/task.yaml
@@ -0,0 +1,16 @@
+summary: Test pulseaudio snap installation was successful
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    # Service should be up an running
+    wait_for_pulseaudio
+    systemctl status snap.pulseaudio.pulseaudio | grep -Pzq ': active'
+
+    # pactl should be able to reach PulseAudio
+    /snap/bin/pulseaudio.pactl list | grep -Pzq 'Module'
+
+    # Ensure all necessary plugs/slots are connected
+    snap interfaces | grep -Pzq "pulseaudio:service +pulseaudio:client"
+    snap interfaces | grep -P "\-\ +pulseaudio:home"
+
diff --git a/tests/main/modules-loaded/task.yaml b/tests/main/modules-loaded/task.yaml
new file mode 100644
index 0000000..e9ee7dd
--- /dev/null
+++ b/tests/main/modules-loaded/task.yaml
@@ -0,0 +1,11 @@
+summary: Test for common PuleAudio modules being loaded
+
+execute: |
+    # Check for some obvious PulseAudio modules
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-device-restore'
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-stream-restore'
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-card-restore'
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-switch-on-port-available'
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-rescue-streams'
+    /snap/bin/pulseaudio.pactl list short | grep -Pzq 'module-suspend-on-idle'
+
diff --git a/tests/main/pactl/task.yaml b/tests/main/pactl/task.yaml
new file mode 100644
index 0000000..01f93d0
--- /dev/null
+++ b/tests/main/pactl/task.yaml
@@ -0,0 +1,6 @@
+summary: Test pactl is working
+
+execute: |
+    # Does it even work?
+    /snap/bin/pulseaudio.pactl info | grep -Pzq 'Server Name: pulseaudio'
+