Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

overlord/snapstate: do a minimal sanity check on containers #4464

Merged
merged 6 commits into from
Jan 18, 2018
Merged

overlord/snapstate: do a minimal sanity check on containers #4464

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91b4232
overlord/snapstate: do a minimal sanity check on containers
chipaca Jan 2, 2018
09d0b43
address review feedback, and tweak spread tests (and improve the vali…
chipaca Jan 10, 2018
9652b83
tests: add a spread test for cotainer validation
chipaca Jan 11, 2018
3328b78
add tests for symlinks, and fix stat of symlinks in squashfs
chipaca Jan 11, 2018
4305dcb
Merge remote-tracking branch 'upstream/master' into snap-permission-s…
chipaca Jan 17, 2018
2f7a8ea
deal with git not dealing with permissions
chipaca Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Empty file added tests/lib/snaps/test-snapd-validate-container-failures/bin/bar
View file
Open in desktop
Empty file.
Empty file added tests/lib/snaps/test-snapd-validate-container-failures/bin/foo
View file
Open in desktop
Empty file.
Empty file added tests/lib/snaps/test-snapd-validate-container-failures/comp.sh
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/bar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> baz -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/bar -> baz
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/bar -> baz -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/bar -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> baz
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/baz
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> bar -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/baz -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> bar
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bar -> baz -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> bar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
baz -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> bar -> baz
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> bar -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
baz
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> baz
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bar -> qux
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> baz -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bar
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/foo -> qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bar -> baz
1 change: 1 addition & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/hell/qux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo -> bar -> baz
Empty file added tests/lib/snaps/test-snapd-validate-container-failures/meta/hooks/what
View file
Open in desktop
Empty file.
11 changes: 11 additions & 0 deletions tests/lib/snaps/test-snapd-validate-container-failures/meta/snap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: test-snapd-validate-container-failures
version: "1"
apps:
foo:
command: bin/foo
completer: comp.sh
stop-command: bin/wat
bard:
command: bin/bar --daemon
daemon: simple
stop-command: bin/stahp
Empty file added tests/lib/snaps/test-snapd-validate-container-failures/meta/unreadable
View file
Open in desktop
Empty file.
22 changes: 22 additions & 0 deletions tests/main/validate-container-failures/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
summary: check the container validator logs on error

environment:
SNAP: test-snapd-validate-container-failures

execute: |
echo "Snap refuses to install"
snap try $TESTSLIB/snaps/$SNAP 2>error.log && exit 1 || true
echo "The error tells you to ask the dev"
tr -s "\n " " " < error.log | MATCH 'contact developer'

# give things time to reach the journal
sleep 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(nitpick) you could write a for i in $(seq 120); do if jounralctl -u snapd | grep check_snap; then break; fi; sleep 0.2; done here but probably not worth it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, I see this was already removed.


echo "And the journal counts the ways"
journalctl -u snapd | grep check_snap > journal.log
MATCH '"comp.sh" should be world-readable' < journal.log
MATCH '"bin/bar" should be executable' < journal.log
MATCH '"bin/foo" should be world-readable and -executable' < journal.log
MATCH '"meta/unreadable" should be world-readable' < journal.log
MATCH '"meta/hooks/what" should be executable' < journal.log
MATCH '"bin/stahp" does not exist' < journal.log