diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-12-19 11:19:08 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2016-12-19 11:19:08 +0100 |
| commit | a67c22b9226f975c10ede583705dbfc16e660066 (patch) | |
| tree | c67f80cc26f5ac3aaefb7ad3e1500b8ca80e1ebe | |
| parent | 7d64b96e2126ce0c18f944c4dd572671f75b5456 (diff) | |
| parent | b25cc24d7029e3ffb28ec710712ebba61b74bca4 (diff) | |
Merge remote-tracking branch 'upstream/master' into bugfix/reenable-ppc64elbugfix/reenable-ppc64el
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | tests/lib/snaps/classic-confinement/bin/classic-confinement | 4 | ||||
| -rw-r--r-- | tests/lib/snaps/classic-confinement/meta/icon.png | bin | 0 -> 3371 bytes | |||
| -rw-r--r-- | tests/lib/snaps/classic-confinement/meta/snap.yaml | 6 | ||||
| -rw-r--r-- | tests/main/classic-confinement/task.yaml | 19 |
5 files changed, 31 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules index 2826060a70..47d33ece69 100755 --- a/debian/rules +++ b/debian/rules @@ -107,6 +107,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) [ $$(strings _build/bin/snapd|grep -c -E "public-key-sha3-384: [a-zA-Z0-9_-]{64}") -eq 1 ] strings _build/bin/snapd|grep -c "^public-key-sha3-384: -CvQKAwRQ5h3Ffn10FILJoEZUXOv6km9FwA80-Rcj-f-6jadQ89VRswHNiEB9Lxk$$" endif + # run the snap-confine tests + $(MAKE) -C cmd check override_dh_systemd_enable: # enable auto-import diff --git a/tests/lib/snaps/classic-confinement/bin/classic-confinement b/tests/lib/snaps/classic-confinement/bin/classic-confinement new file mode 100755 index 0000000000..475afd0ca7 --- /dev/null +++ b/tests/lib/snaps/classic-confinement/bin/classic-confinement @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "tmp" +ls -l /tmp diff --git a/tests/lib/snaps/classic-confinement/meta/icon.png b/tests/lib/snaps/classic-confinement/meta/icon.png Binary files differnew file mode 100644 index 0000000000..1ec92f1241 --- /dev/null +++ b/tests/lib/snaps/classic-confinement/meta/icon.png diff --git a/tests/lib/snaps/classic-confinement/meta/snap.yaml b/tests/lib/snaps/classic-confinement/meta/snap.yaml new file mode 100644 index 0000000000..2750cd397b --- /dev/null +++ b/tests/lib/snaps/classic-confinement/meta/snap.yaml @@ -0,0 +1,6 @@ +name: classic-confinement +version: 1.0 +confinement: classic +apps: + classic-confinement: + command: bin/classic-confinement diff --git a/tests/main/classic-confinement/task.yaml b/tests/main/classic-confinement/task.yaml new file mode 100644 index 0000000000..fd9ccbb6df --- /dev/null +++ b/tests/main/classic-confinement/task.yaml @@ -0,0 +1,19 @@ +summary: Ensure that classic confinement works + +systems: [-ubuntu-core-16-64, -ubuntu-core-16-arm-64, -ubuntu-core-16-arm-32] + +prepare: | + . $TESTSLIB/snaps.sh + snapbuild "$TESTSLIB/snaps/classic-confinement/" . + +execute: | + echo "Check that classic snaps work only with --classic" + if snap install --dangerous classic-confinement_1.0_all.snap; then + echo "snap install needs --classic to install snaps with classic confinment" + exit 1 + fi + + echo "Check that the classic snap works (it skips the entire sandbox)" + snap install --dangerous --classic classic-confinement_1.0_all.snap + touch /tmp/lala + classic-confinement | MATCH lala |