Merge pull request #2780 from Amulyam24/checks

cmd: get return value for setCPUtype
This commit is contained in:
Chelsea Mafrica 2021-10-04 22:19:59 -07:00 committed by GitHub
commit db7d3b91bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions

View File

@ -39,7 +39,8 @@ func testSetCPUTypeGeneric(t *testing.T) {
_, config, err := makeRuntimeConfig(tmpdir) _, config, err := makeRuntimeConfig(tmpdir)
assert.NoError(err) assert.NoError(err)
setCPUtype(config.HypervisorType) err = setCPUtype(config.HypervisorType)
assert.NoError(err)
assert.Equal(archRequiredCPUFlags, savedArchRequiredCPUFlags) assert.Equal(archRequiredCPUFlags, savedArchRequiredCPUFlags)
assert.Equal(archRequiredCPUAttribs, savedArchRequiredCPUAttribs) assert.Equal(archRequiredCPUAttribs, savedArchRequiredCPUAttribs)

View File

@ -58,51 +58,51 @@ func TestArchKernelParamHandler(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
type testData struct { type testData struct {
onVMM bool
expectIgnore bool
fields logrus.Fields fields logrus.Fields
msg string msg string
onVMM bool
expectIgnore bool
} }
data := []testData{ data := []testData{
{true, false, logrus.Fields{}, ""}, {logrus.Fields{}, "", true, false},
{false, false, logrus.Fields{}, ""}, {logrus.Fields{}, "", false, false},
{ {
false,
false,
logrus.Fields{ logrus.Fields{
// wrong type // wrong type
"parameter": 123, "parameter": 123,
}, },
"foo", "foo",
false,
false,
}, },
{ {
false,
false,
logrus.Fields{ logrus.Fields{
"parameter": "unrestricted_guest", "parameter": "unrestricted_guest",
}, },
"", "",
false,
false,
}, },
{ {
true,
true,
logrus.Fields{ logrus.Fields{
"parameter": "unrestricted_guest", "parameter": "unrestricted_guest",
}, },
"", "",
true,
true,
}, },
{ {
false,
true,
logrus.Fields{ logrus.Fields{
"parameter": "nested", "parameter": "nested",
}, },
"", "",
false,
true,
}, },
} }