mask: fix test & improve error messages

Resolves: #188
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

src/pkgdev/scripts/pkgdev_mask.py

@@ -101,7 +101,12 @@ def _mask_validate(parser, namespace):
     atoms = set()
     maintainers = set()
 
-    namespace.bugs = list(map(int, dict.fromkeys(namespace.bugs)))
+    try:
+        namespace.bugs = list(map(int, dict.fromkeys(namespace.bugs)))
+    except ValueError:
+        parser.error("argument -b/--bug: invalid integer value")
+    if min(namespace.bugs, default=1) < 1:
+        parser.error("argument -b/--bug: must be >= 1")
 
     if not namespace.rites and namespace.file_bug:
         mask.error("bug filing requires last rites")

tests/scripts/test_pkgdev_mask.py

@@ -337,6 +337,7 @@ def test_mask_bugs(self):
             for bug_nums, expected in [
                 (["42"], "Bug #42."),
                 (["42", "43"], "Bugs #42, #43."),
+                (["42,43", "43"], "Bugs #42, #43."),
             ]:
                 args = []
                 for bug_num in bug_nums:
@@ -361,7 +362,7 @@ def test_mask_bugs(self):
 
     def test_mask_bug_bad(self, capsys, tool):
         for arg, expected in [("-1", "must be >= 1"), ("foo", "invalid integer value")]:
-            with pytest.raises(SystemExit):
+            with pytest.raises(SystemExit), chdir(pjoin(self.repo.path)):
                 tool.parse_args(["mask", "--bug", arg])
             out, err = capsys.readouterr()
             assert err.strip() == f"pkgdev mask: error: argument -b/--bug: {expected}"