tests/upgrade/basic: skip classic test if "snap pack" missing
- Loading branch information...
|
|
@@ -30,8 +30,11 @@ execute: | |
|
|
echo "Install sanity check snaps with it"
|
|
|
snap install test-snapd-tools
|
|
|
snap install test-snapd-auto-aliases
|
|
|
- if is_classic_confinement_supported; then
|
|
|
+ # transitional: drop the "snap pack" check once it's released
|
|
|
+ do_classic=no
|
|
|
+ if is_classic_confinement_supported && snap pack --help >&/dev/null ; then
|
|
|
install_local_classic test-snapd-classic-confinement
|
|
|
+ do_classic=yes
|
|
|
fi
|
|
|
|
|
|
echo "Sanity check installs"
|
|
|
@@ -54,7 +57,7 @@ execute: | |
|
|
snap list | grep test-snapd-tools
|
|
|
test-snapd-tools.echo Hello | grep Hello
|
|
|
test-snapd-tools.env | grep SNAP_NAME=test-snapd-tools
|
|
|
- if is_classic_confinement_supported; then
|
|
|
+ if [ "$do_classic" = yes ]; then
|
|
|
test-snapd-classic-confinement.recurse 5
|
|
|
fi
|
|
|
|
|
|
|
