Add tests for limit config

- Catching ValueErrors from ResolutionDateRedacter constructor and
  report the error message now. Previously those error messages didn't
  get reported to the user.

Author: fapdash

gitprivacy/gitprivacy.py

@@ -47,17 +47,19 @@ def read_config(self):
         with self.repo.config_reader() as config:
             self.mode = config.get_value(self.SECTION, 'mode', 'reduce')
             self.pattern = config.get_value(self.SECTION, 'pattern', '')
-            self.limit = config.get_value(self.SECTION, "limitHour", config.get_value(self.SECTION, 'limit', ''))
-            if config.get_value(self.SECTION, 'limit', False):
+            self.limit = config.get_value(self.SECTION, "limitHour",
+                                          config.get_value(self.SECTION, 'limit', ''))
+            if config.has_option(self.SECTION, 'limit'):
                 click.echo(click.wrap_text(
-                    'The option privacy.limit is deprecated and will be removed in future versions.'
+                    'Warning: The option privacy.limit is deprecated and will be removed in future versions.'
                     'Use privacy.limitHour instead.'
                 ))
-            if config.get_value(self.SECTION, 'limit', False) and config.get_value(self.SECTION, 'limitHour', False):
+            if config.has_option(self.SECTION, 'limit') and config.has_option(self.SECTION, 'limitHour'):
                 click.echo(click.wrap_text(
-                    'Not allowed to use the deprecated privacy.limit and privacy.limitHour at the same time.'
+                    'Error: Not allowed to use the deprecated privacy.limit and privacy.limitHour at the same time.'
                     'Only use privacy.limitHour instead.'
-                ))
+                ), err=True)
+                ctx.exit(1)
             self.limitDay = config.get_value(self.SECTION, "limitWeekday", '')
             self.password = config.get_value(self.SECTION, 'password', '')
             self.salt = config.get_value(self.SECTION, 'salt', '')
@@ -104,7 +106,12 @@ def get_dateredacter(self) -> DateRedacter:
                 "following time unit identifiers: "
                 "M: month, d: day, h: hour, m: minute, s: second.",
                 preserve_paragraphs=True))
-        return ResolutionDateRedacter(self.pattern, self.limit, self.limitDay, self.mode)
+        try:
+            redacter = ResolutionDateRedacter(self.pattern, self.limit, self.limitDay, self.mode)
+        except ValueError as e:
+            click.echo(click.wrap_text(str(e)))
+            ctx.exit(1)
+        return redacter
 
     def write_config(self, **kwargs):
         """Write config"""

tests/test_gitprivacy.py

@@ -1094,6 +1094,56 @@ def test_prepush_check(self):
             )
             self.assertEqual(res, 0)
 
+    def test_limithour_config(self):
+        with self.runner.isolated_filesystem():
+            self.setUpRepo()
+            self.setConfig()
+            self.addCommit("a")
+            self.git.config(["privacy.limit", "0-8"])
+            result = self.invoke('redate')
+            self.assertIn("The option privacy.limit is deprecated", result.output)
+            self.assertEqual(result.exit_code, 0)
+            self.addCommit("b")
+            self.git.config(["privacy.limitHour", "0-8"])
+            result = self.invoke('redate')
+            self.assertIn(
+                "Error: Not allowed to use the deprecated",
+                result.output
+            )
+            self.assertEqual(result.exit_code, 1)
+            self.git.config(["--unset", "privacy.limit"])
+            self.git.config(["privacy.limitHour", "invalid"])
+            result = self.invoke('redate')
+            self.assertIn(
+                "Unexpected syntax for limit.",
+                result.output
+            )
+            self.assertEqual(result.exit_code, 1)
+            self.git.config(["privacy.limitHour", "20-24"])
+            result = self.invoke('redate')
+            self.assertEqual(result.exit_code, 0)
+
+    def test_limitweekday_config(self):
+        with self.runner.isolated_filesystem():
+            self.setUpRepo()
+            self.setConfig()
+            self.addCommit("a")
+            self.git.config(["privacy.limitWeekday", "1-0"])
+            result = self.invoke('redate')
+            self.assertIn("Start day can't be after end day for limit_day.", result.output)
+            self.assertEqual(result.exit_code, 1)
+            self.addCommit("b")
+            self.git.config(["privacy.limitWeekday", "0,1,7"])
+            result = self.invoke('redate')
+            self.assertIn(
+                "Day must be between 0 and 6 for limit_day.",
+                result.output
+            )
+            self.assertEqual(result.exit_code, 1)
+            self.git.config(["privacy.limitWeekday", "0, 1, 2,3,4,5,6"])
+            result = self.invoke('redate')
+            self.assertEqual(result.exit_code, 0)
+
     def test_prepush_check_multiple_remotes(self):
         with self.runner.isolated_filesystem():
             self.setUpRepo()