summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c7254d2)
This check gives FAIL if the option value is 'off' or
the option is not found. In other cases this check gives OK.
This feature is needed for checking that the CPU vulnerability mitigations
are not disabled. Let's see how it works and maybe improve it in future.
'invalid expected value "{}" for "{}" check (1)'.format(expected, name)
val_len = len(expected.split())
if val_len == 3:
'invalid expected value "{}" for "{}" check (1)'.format(expected, name)
val_len = len(expected.split())
if val_len == 3:
- assert(expected == 'is not set'), \
+ assert(expected == 'is not set' or expected == 'is not off'), \
'invalid expected value "{}" for "{}" check (2)'.format(expected, name)
else:
assert(val_len == 1), \
'invalid expected value "{}" for "{}" check (2)'.format(expected, name)
else:
assert(val_len == 1), \
self.result = 'OK: is present'
return
self.result = 'OK: is present'
return
+ # handle the 'is not off' option check
+ if self.expected == 'is not off':
+ if self.state == 'off':
+ self.result = 'FAIL: is off'
+ elif self.state is None:
+ self.result = 'FAIL: is off, not found'
+ else:
+ self.result = 'OK: is not off, "' + self.state + '"'
+ return
+
# handle the option value check
if self.expected == self.state:
self.result = 'OK'
# handle the option value check
if self.expected == self.state:
self.result = 'OK'
self.result = 'OK: {} is not found'.format(opt.name)
elif opt.result == 'OK: is present':
self.result = 'OK: {} is present'.format(opt.name)
self.result = 'OK: {} is not found'.format(opt.name)
elif opt.result == 'OK: is present':
self.result = 'OK: {} is present'.format(opt.name)
+ elif opt.result.startswith('OK: is not off'):
+ self.result = 'OK: {} is not off'.format(opt.name)
else:
# VersionCheck provides enough info
assert(opt.result.startswith('OK: version')), \
else:
# VersionCheck provides enough info
assert(opt.result.startswith('OK: version')), \
self.result = 'FAIL: {} is not "{}"'.format(opt.name, opt.expected)
elif opt.result == 'FAIL: is not present':
self.result = 'FAIL: {} is not present'.format(opt.name)
self.result = 'FAIL: {} is not "{}"'.format(opt.name, opt.expected)
elif opt.result == 'FAIL: is not present':
self.result = 'FAIL: {} is not present'.format(opt.name)
+ elif opt.result == 'FAIL: is off':
+ self.result = 'FAIL: {} is off'.format(opt.name)
+ elif opt.result == 'FAIL: is off, not found':
+ self.result = 'FAIL: {} is off, not found'.format(opt.name)
else:
# VersionCheck provides enough info
self.result = opt.result
else:
# VersionCheck provides enough info
self.result = opt.result