Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests errors message assertion #16

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cron_converter/sub_modules/part.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def from_string(self, cron_part: str) -> None:
raise ValueError(f'Invalid value {string_part!r} in cron part {cron_part!r}')
range_string = range_step_string_parts[0]
if not range_string:
raise ValueError(f'Invalid value {range_string}')
raise ValueError(f'Invalid value {string_part!r} for {self.unit.get("name")!r}')
elif range_string == '*':
range_list = self.possible_values()
else:
Expand Down Expand Up @@ -115,8 +115,7 @@ def _fix_sunday(self, values: List[int]) -> List[int]:
values = [0 if value == 7 else value for value in values]
return values

@staticmethod
def _parse_range(unit_range: str) -> List[int]:
def _parse_range(self, unit_range: str) -> List[int]:
"""Parses a range string. Example: input="15-19" output=[15, 16, 17, 18, 19]

:param unit_range: The range string.
Expand All @@ -139,7 +138,7 @@ def _parse_range(unit_range: str) -> List[int]:
except ValueError as exc:
raise ValueError(f'Invalid min or max value from: {unit_range!r} --> {exc}')
if max_value < min_value:
raise ValueError(f'Max range is less than min range in {unit_range}')
raise ValueError(f'Max range is less than min range in {unit_range!r} for {self.unit.get("name")!r}')
return [int_value for int_value in range(min_value, max_value + 1)]
else:
raise ValueError(f'Invalid value {unit_range}')
Expand Down
29 changes: 17 additions & 12 deletions tests/integration/fixtures/invalid_crons.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,61 +17,66 @@
{
'string': '0 0 0 0 0',
'error': ValueError,
'message': 'Value "0" out of range for day'
'message': "Value 0 out of range for 'day'"
},
{
'string': '0 0 0 1 0',
'error': ValueError,
'message': 'Value "0" out of range for day'
'message': "Value 0 out of range for 'day'"
},
{
'string': '0 0 1 0 0',
'error': ValueError,
'message': 'Value "0" out of range for month'
'message': "Value 0 out of range for 'month'"
},
{
'string': '/ / / / /',
'error': ValueError,
'message': 'Invalid value "/" for minute'
'message': "Invalid value '/' for 'minute'"
},
{
'string': '60 5 5 5 5',
'error': ValueError,
'message': 'Value "60" out of range for minute'
'message': "Value 60 out of range for 'minute'"
},
{
'string': '/5 5 5 5 5',
'error': ValueError,
'message': 'Invalid value "/5" for minute'
'message': "Invalid value '/5' for 'minute'"
},
{
'string': '10-5/5 5 5 5 5',
'error': ValueError,
'message': 'Max range is less than min range in "10-5" for minute'
'message': "Max range is less than min range in '10-5' for 'minute'"
},
{
'string': '* * 0 * *',
'error': ValueError,
'message': 'Value "0" out of range for day'
'message': "Value 0 out of range for 'day'"
},
{
'string': '* * * 0 *',
'error': ValueError,
'message': 'Value "0" out of range for month'
'message': "Value 0 out of range for 'month'"
},
{
'string': '0/5/5 * * 0 *',
'error': ValueError,
'message': 'Invalid value "0/5/5" for minute'
'message': "Invalid value '0/5/5' in cron part '0/5/5'"
},
{
'string': '* 1-12/0 * * *',
'error': ValueError,
'message': "Invalid interval step value '0' for 'hour'"
},
{
'string': '5/a * * * *',
'error': ValueError,
'message': 'Invalid interval step value "a" for minute'
'message': "Invalid interval step value 'a' for 'minute'"
},
{
'string': '5/ * * * *',
'error': ValueError,
'message': 'Invalid interval step value "" for minute'
'message': "Invalid interval step value '' for 'minute'"
}
]
3 changes: 2 additions & 1 deletion tests/integration/tests_cron_invalid.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class CronTestInvalid(unittest.TestCase):
def test_from_string(self):
for invalid_cron in invalid_crons:
with self.subTest(range=invalid_cron):
with self.assertRaises(invalid_cron['error'], msg=invalid_cron['message']):
with self.assertRaises(invalid_cron['error']) as error:
cron = Cron()
cron.from_string(invalid_cron['string'])
self.assertEqual(str(error.exception), invalid_cron['message'])
2 changes: 2 additions & 0 deletions tests/unit/tests_part.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ def test_get_step(self):
self.assertEqual(part.get_step(), 3, "The result has to be 3")
part.values = [1, 6, 11]
self.assertEqual(part.get_step(), 5, "The result has to be 5")
part.values = [1, 2, 3, 4, 5, 6]
self.assertIsNone(part.get_step(), "The result has to be None")

def test_is_interval(self):
part = Part(units[0], {})
Expand Down
Loading