Commit 3ff6e747 by Alexander Popov

Turn some error conditions into assertions (part 1)

parent 4def5a25
...@@ -88,8 +88,8 @@ SIMPLE_OPTION_TYPES = ('kconfig', 'version', 'cmdline') ...@@ -88,8 +88,8 @@ SIMPLE_OPTION_TYPES = ('kconfig', 'version', 'cmdline')
class OptCheck: class OptCheck:
# Constructor without the 'expected' parameter is for option presence checks (any value is OK) # Constructor without the 'expected' parameter is for option presence checks (any value is OK)
def __init__(self, reason, decision, name, expected=None): def __init__(self, reason, decision, name, expected=None):
if not reason or not decision or not name: assert(reason and decision and name), \
sys.exit('[!] ERROR: invalid {} check for "{}"'.format(self.__class__.__name__, name)) 'invalid {} check for "{}"'.format(self.__class__.__name__, name)
self.name = name self.name = name
self.expected = expected self.expected = expected
self.decision = decision self.decision = decision
...@@ -185,12 +185,12 @@ class VersionCheck: ...@@ -185,12 +185,12 @@ class VersionCheck:
class ComplexOptCheck: class ComplexOptCheck:
def __init__(self, *opts): def __init__(self, *opts):
self.opts = opts self.opts = opts
if not self.opts: assert(self.opts), \
sys.exit('[!] ERROR: empty {} check'.format(self.__class__.__name__)) 'empty {} check'.format(self.__class__.__name__)
if len(self.opts) == 1: assert(len(self.opts) != 1), \
sys.exit('[!] ERROR: useless {} check'.format(self.__class__.__name__)) 'useless {} check: {}'.format(self.__class__.__name__, opts)
if not isinstance(opts[0], KconfigCheck) and not isinstance(opts[0], CmdlineCheck): assert(isinstance(opts[0], KconfigCheck) or isinstance(opts[0], CmdlineCheck)), \
sys.exit('[!] ERROR: invalid {} check: {}'.format(self.__class__.__name__, opts)) 'invalid {} check: {}'.format(self.__class__.__name__, opts)
self.result = None self.result = None
@property @property
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment