This is a purely mechanical change because it touches so many files, the real
interesting parts we need that prompted this will be followups.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
We will need to add Model to Device for UC20 cases, prepare for that
by forcing MockUC20Device to use one and produce output consistent
with it.
Make also the behavior of MockDevice a bit more consistent/realistic
though it has limited use for UC20, it allowed for mode != "run"
with HasModeenv false for example.
This is needed because the uc18/uc16 bootloader implementations do not actually
do this, and instead snapd needs to reset the value.
Also modify the bootenv bootloader logic simulation to not clean this anymore,
just as the real bootloaders do.
This all requires some slight changes to the test logic, which since they are
checking the BootVars map directly will see some additional empty keys in the
map as markSuccessful will now write those empty keys. Eventually we should port
these tests to use GetBootVars and not use the map directly since empty
string keys show up the same as missing keys with GetBootVars and that would
have prevented needing to change these tests at all.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
This internally uses Bootenv16, with snap_mode usage replaced with kernel_status
which is what we have for UC20.
Also fix doc-comment on RunBootenv20.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
In a future refactor of the boot tests, we will always need to write out a new
modeenv in the tests and never just read it, so we don't need this mocking
utility anymore.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
This is more consistent and means the same thing everywhere else, except for one
test helper which is also updated here to now mean the same thing.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
This makes future tests simpler, and since it's all in memory is simpler than
writing out the files to the filesystem for each test, since restoring it is
just defer'ing the returned function.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
This will be used by bootStateFor in determining if a given device is a UC20
device and thus needs a different bootState implementation.
Adjust some tests to ensure that we have a modeenv when expected and don't when
expected.
This also requires refactoring the MockDevice in boottest to be slightly more
complicated to have devices that are in run mode, but are not uc20.
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
instead of passing model and/or a classic flag to them
and adding operating mode now as well, pass a new interface
boot.Device that is implemented by DeviceContext
