diff --git a/.pylintrc b/.pylintrc index a16c57154240659a99a157663d04525db998033d..94c0afa284fac824172002982f00724614d87eb4 100644 --- a/.pylintrc +++ b/.pylintrc @@ -70,11 +70,11 @@ max-branchs=12 max-statements=50 max-parents=7 max-attributes=7 -min-public-methods=2 +min-public-methods=1 max-public-methods=20 [IMPORTS] -deprecated-modules=regsub,string,TERMIOS,Bastion,rexec +deprecated-modules=regsub,TERMIOS,Bastion,rexec import-graph= ext-import-graph= int-import-graph= diff --git a/chkcrontab_lib.py b/chkcrontab_lib.py index dded62dab1adc5ec0a4595e4c3e1d4e11f749a14..ac1e8a4f3e68fbe715e2ca655d796623ba070a80 100755 --- a/chkcrontab_lib.py +++ b/chkcrontab_lib.py @@ -342,22 +342,22 @@ class CronTimeField(object): return self._text @property - def kind(self): + def Kind(self): """Kind field.""" return self._kind @property - def start(self): + def Start(self): """Start value of this field.""" return self._start @property - def end(self): + def End(self): """End value of this field.""" return self._end @property - def step(self): + def Step(self): """Step for this field.""" return self._step @@ -488,7 +488,7 @@ def ChkCTStarOnly(cron_time_field): """ if not cron_time_field: return True - if len(cron_time_field) == 1 and cron_time_field[0].kind == 'star': + if len(cron_time_field) == 1 and cron_time_field[0].Kind == 'star': return True return False @@ -693,6 +693,7 @@ class CronLineTimeAction(object): self.command = command def _CheckTimeField(self, log): + """Virtual method to be implemented by subclasses to check time field.""" pass def ValidateAndLog(self, log): @@ -782,6 +783,11 @@ class CronLineUnknown(object): """For unrecognised cron lines.""" def ValidateAndLog(self, log): + """Emits an error for unrecognised cron lines. + + Args: + log: A LogCounter instance to record issues. + """ log.LineError(log.MSG_LINE_ERROR, 'Failed to parse line.') diff --git a/tests/test_check.py b/tests/test_check.py index 3bf95e54317381f65c1af6426b4a787e292232d9..87ac551646332474e63ce43d5abd63135abd3a8f 100755 --- a/tests/test_check.py +++ b/tests/test_check.py @@ -71,10 +71,10 @@ class FSMUnitTest(unittest.TestCase): len(parsed_fields['cron_times']))) for i in range(min(len(parsed_fields['cron_times']), len(check_parsed_fields['cron_times']))): - self.assertEquals(parsed_fields['cron_times'][i].kind, + self.assertEquals(parsed_fields['cron_times'][i].Kind, check_parsed_fields['cron_times'][i][0], 'Parser detected "%s" field not "%s"' - % (parsed_fields['cron_times'][i].kind, + % (parsed_fields['cron_times'][i].Kind, check_parsed_fields['cron_times'][i][0])) self.assertEquals('%s' % parsed_fields['cron_times'][i], check_parsed_fields['cron_times'][i][1],