norohind/zfs_autobackup
1
0
Fork 0
forked from third-party-mirrors/zfs_autobackup
Code Pull Requests Activity

tests, nicer error message for invalid schedule str

Browse Source
This commit is contained in:
Edwin Eefting 2021-04-13 16:42:55 +02:00
parent f9719ba87e
commit bef3be4955
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test_thinner.py
View File

@ -3,7 +3,7 @@ import pprint
from zfs_autobackup.Thinner import Thinner from zfs_autobackup.Thinner import Thinner
#randint is different in python 2 vs 3 # randint is different in python 2 vs 3
randint_compat = lambda lo, hi: lo + int(random.random() * (hi + 1 - lo)) randint_compat = lambda lo, hi: lo + int(random.random() * (hi + 1 - lo))
@ -23,6 +23,20 @@ class TestThinner(unittest2.TestCase):
# return super().setUp() # return super().setUp()
def test_exceptions(self):
with self.assertRaisesRegexp(Exception, "^Invalid period"):
ThinnerRule("12X12m")
with self.assertRaisesRegexp(Exception, "^Invalid ttl"):
ThinnerRule("12d12X")
with self.assertRaisesRegexp(Exception, "^Period cant be"):
ThinnerRule("12d1d")
with self.assertRaisesRegexp(Exception, "^Invalid schedule"):
ThinnerRule("XXX")
def test_incremental(self): def test_incremental(self):
ok=['2023-01-03 10:53:16', ok=['2023-01-03 10:53:16',
'2024-01-02 15:43:29', '2024-01-02 15:43:29',

4
zfs_autobackup/ThinnerRule.py
View File

@ -39,6 +39,10 @@ class ThinnerRule:
rule_str = rule_str.lower() rule_str = rule_str.lower()
matches = re.findall("([0-9]*)([a-z]*)([0-9]*)([a-z]*)", rule_str)[0] matches = re.findall("([0-9]*)([a-z]*)([0-9]*)([a-z]*)", rule_str)[0]
if '' in matches:
raise (Exception("Invalid schedule string: '{}'".format(rule_str)))
print(matches)
period_amount = int(matches[0]) period_amount = int(matches[0])
period_unit = matches[1] period_unit = matches[1]
ttl_amount = int(matches[2]) ttl_amount = int(matches[2])