- if opt.result == 'OK' and i != 0:
- # Simple OK is not enough for additional checks, add more info:
- self.result = 'OK: {} "{}"'.format(opt.name, opt.expected)
- else:
- self.result = opt.result
+ self.result = opt.result
+ # Add more info for additional checks:
+ if i != 0:
+ if opt.result == 'OK':
+ self.result = 'OK: {} "{}"'.format(opt.name, opt.expected)
+ elif opt.result == 'OK: not found':
+ self.result = 'OK: {} not found'.format(opt.name)
+ elif opt.result == 'OK: is present':
+ self.result = 'OK: {} is present'.format(opt.name)
+ else:
+ # VersionCheck provides enough info
+ assert(opt.result.startswith('OK: version')), \
+ 'unexpected OK description "{}"'.format(opt.result)