From 8b9933edfb322c8df2078dfdfb85dde501f5a894 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 11 Nov 2022 07:09:06 +0100 Subject: [PATCH] check_bugowner: Don't get tripped over trailing space --- check_bugowner.py | 4 ++-- tests/check_bugowner_tests.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/check_bugowner.py b/check_bugowner.py index 16c91800..b2ef92fa 100755 --- a/check_bugowner.py +++ b/check_bugowner.py @@ -31,10 +31,10 @@ class CheckerBugowner(ReviewBot.ReviewBot): for line in self.request.description.splitlines(): matched_package = None matched_maintainer = None - m = re.match(r'\s*bugowner:\s*(\S*)\s*$', line) + m = re.match(r'\s*bugowner:\s*(\S+)\s*$', line) if m: matched_maintainer = m.group(1) - m = re.match(r'\s*bugowner:\s(\S*)\s(\S*)\s*$', line) + m = re.match(r'\s*bugowner:\s(\S+)\s(\S+)\s*$', line) if m: matched_maintainer = m.group(2) matched_package = m.group(1) diff --git a/tests/check_bugowner_tests.py b/tests/check_bugowner_tests.py index f2db72e3..8ed3349b 100644 --- a/tests/check_bugowner_tests.py +++ b/tests/check_bugowner_tests.py @@ -81,6 +81,19 @@ class TestCheckBugowner(OBSLocal.TestCase): self.assertReview(req_id, by_user=(self.bot_user, 'accepted')) + @pytest.mark.usefixtures("default_config") + def test_valid_bugowner_with_space(self): + """Accept request with valid maintainer with space""" + self.wf.create_user('thegirl') + req_id = self.wf.create_submit_request('devel:wine', 'merlot', description="bugowner: thegirl ").reqid + + self.assertReview(req_id, by_user=(self.bot_user, 'new')) + + self.review_bot.set_request_ids([req_id]) + self.review_bot.check_requests() + + self.assertReview(req_id, by_user=(self.bot_user, 'accepted')) + @pytest.mark.usefixtures("default_config") def test_valid_bugowner_group(self): """Accept request with valid group maintainer"""