snap-repair: add uc20 support #9383
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a minimal change for snap-repair to support uc20. The tests require a rework, ideally we would run all tests for a uc16 and a uc20 model.
mvo5
force-pushed
the
snap-repair-uc20-simple
branch
from
061a00f
to
a8d27d9
Compare
This commit keeps the version independent tests in runnerSuite. It also uses testutil.BaseTest to simplify things.
mvo5
force-pushed
the
snap-repair-uc20-simple
branch
from
a8d27d9
to
f2f9c24
Compare
The tests that deal with initState/writeSeedAssert now run with both uc16/uc20 where it makes sense. A new test runner20Suite.TestLoadStateInitDeviceInfoFail that checks the failure conditions for modeenv reading is also added.
mvo5
changed the title
pedronis
reviewed
Sep 23, 2020
Co-authored-by: Maciej Borzecki <maciek.borzecki@gmail.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
anonymouse64
approved these changes
Sep 28, 2020
| @@ -1778,3 +1669,218 @@ ls -l ${PATH##*:}/repair | |||
| c.Assert(err, IsNil) | |||
|
|
|||
| } | |||
|
|
|||
| // shared1620RunnerSuite is embedded by runner16Suite and | |||
There was a problem hiding this comment.
super super super super nitpicky, but this reads to me as "ubuntu core 1620" which is either 400 years old or 1600 years away in the future 😄
I would just rename this
Suggested change
| // shared1620RunnerSuite is embedded by runner16Suite and | |
| // sharedRunnerSuite is embedded by runner16Suite and |
also afaik, the behavior on uc16 is the same as uc18, so really it's shared between all three variants
but again nitpick, no need to rename this unless you want to appease my nitpicks
|
|
||
| const errPrefix = "cannot set device information: " | ||
| tests := []struct { | ||
| breakFunc func() |
| err = ioutil.WriteFile(dirs.SnapModeenvFile, mockModeenv, 0644) | ||
| c.Assert(err, IsNil) | ||
| // validate that modeenv is actually valid | ||
| _, err = boot.ReadModeenv("") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a minimal change for snap-repair to support uc20. Some test refactor as well to make it easier to run tests with both a uc16 and uc20 setup.