tests: don't guess in is_classic_confinement_supported #7396
Conversation
Snapd can tell us if the system supports classic confinement. We don't need to inspect SPREAD_SYSTEM to do that. Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
| return 0 | ||
| ;; | ||
| esac | ||
| if snap debug sandbox-features --required=confinement-options:classic; then |
There was a problem hiding this comment.
That requires snapd to be running though? Given that the travis job complete I guess it's not really called when snapd is down.
Why not:
is_classic_confinement_supported() {
snap debug sandbox-features --required=confinement-options:classic
}
There was a problem hiding this comment.
Hmm, because I assumed it would break set -e.
There was a problem hiding this comment.
It seems like we stumbled into another shell pitfall - set -e does not happen inside shell function, see below. However Maciej suggestion works because its the last command inside the function so the exit status of the function is set correctly.
$ sh /tmp/lala.sh
#!/bin/sh -e
cat $0
func() {
echo in_func_header
false
echo in_func_footer
}
func
echo $?
echo "after func"
# OUTPUT:
in_func_header
in_func_footer
0
after func
It seems other people stumbled on this as well: https://stackoverflow.com/questions/4072984/how-do-i-get-effect-and-usefuless-of-set-e-inside-a-shell-function - shell is just not a good language it seems :/
|
Nice change, thanks!! |
Snapd can tell us if the system supports classic confinement. We don't
need to inspect SPREAD_SYSTEM to do that.
Signed-off-by: Zygmunt Krynicki me@zygoon.pl