tests: spread test snap dir migration #11280
Conversation
MiguelPires
force-pushed
the
hidden-snap-spread
branch
from
9f0bec5
to
376bbd7
Compare
Codecov Report
@@ Coverage Diff @@
## master #11280 +/- ##
==========================================
- Coverage 78.34% 78.24% -0.11%
==========================================
Files 927 927
Lines 105735 105979 +244
==========================================
+ Hits 82838 82923 +85
- Misses 17745 17899 +154
- Partials 5152 5157 +5
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
tests/main/hidden-snap-dir/task.yaml
Outdated
| rm -rf "$BLOB_DIR" | ||
|
|
||
| snap set system experimental.hidden-snap-folder! | ||
| snap remove "$SNAP_NAME" |
There was a problem hiding this comment.
what reminds me the tests/lib/reset.sh needs to be updated to remove /root/.snap and /home/test/.snap
tests/main/hidden-snap-dir/task.yaml
Outdated
| #shellcheck source=tests/lib/store.sh | ||
| . "$TESTSLIB"/store.sh | ||
|
|
||
| snap install "$SNAP_NAME" |
There was a problem hiding this comment.
It would probably be better to avoid poking the real store and use make_snap_installable to generate the necessary assertions. Or you could replace the store completely and just use local snaps, where the refresh could then be replaced by another installation of the same snap which will bump its revision. IIRC from the perspective of migration this should be identical to a refresh from store.
There was a problem hiding this comment.
I changed the refresh and install for local installs. Thanks for the suggestion
Test that a snapshot taken before migrating the snap can be restored after the migration. Also, replace the installs with 'snaps-state install-local' and other minor improvements.
tests/main/hidden-snap-dir/task.yaml
Outdated
| "$TESTSTOOLS"/snaps-state install-local "$NAME" | ||
|
|
||
| restore: | | ||
| snap set system experimental.hidden-snap-folder! |
There was a problem hiding this comment.
(nitpick) snap unset system experimental.hidden-snap-folder is maybe a bit easier to read
| not test -d "$HOME"/.snap/data | ||
|
|
||
| echo "Take a snapshot" | ||
| "$NAME".cmd echo "prev_data" > "$HOME"/snap/"$NAME"/current/data |
There was a problem hiding this comment.
(nitpick^3) There is a test-snapd-tools.echo" command so this *could* use just that insead of going via cmd echo` but it's really a minor thing, feel free to ignore
tests/main/hidden-snap-dir/task.yaml
Outdated
| echo "Restore snapshot and check data was restored" | ||
| snap restore "$snapshot" | ||
| # shellcheck disable=SC2002 | ||
| cat "$HOME"/.snap/data/"$NAME"/x2/data | MATCH "prev_data" |
There was a problem hiding this comment.
(nitpick) MATCH "prev_data" < "$HOME"/.snap/data/"$NAME"/x2/data would also work and avoid the shellcheck disable - or am I missing something? Not really important just a tiny bit more compact because it avoids the extra shellcheck disable line.
There was a problem hiding this comment.
No, that's good too. I just went with this option because in a previous PR someone preferred the cat and UUoC warning disable since it was more explicit. But this one is very simple, so I think < is quite readable.
Test that the experimental "hidden snap folder" migrates the snap user data and sets the right environment variables after a refresh.