From 4a9894c86a6429a8cbd4bd5e94a48751ea37205b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Wed, 24 Aug 2022 15:33:03 +0200 Subject: [PATCH] Correctly convert bugzilla date to arrow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bugzilla returns xmlrpc.client.DateTime object instead of just datetime. Let's adjust the conversion to this fact. Signed-off-by: Michal Konečný --- tests/plugins/test_scm_request_processor.py | 11 ++++++----- toddlers/plugins/scm_request_processor.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/plugins/test_scm_request_processor.py b/tests/plugins/test_scm_request_processor.py index 536e1fa..1ec93de 100644 --- a/tests/plugins/test_scm_request_processor.py +++ b/tests/plugins/test_scm_request_processor.py @@ -5,6 +5,7 @@ import json import logging import re from unittest.mock import call, MagicMock, Mock, patch +import xmlrpc.client import arrow from pagure_messages.issue_schema import IssueCommentAddedV1, IssueNewV1 @@ -2572,9 +2573,9 @@ class TestValidateReviewBug: "name": "fedora-review", "status": "", "setter": assignee, - "modification_date": arrow.utcnow() - .shift(days=-61) - .format("YYYY-MM-DDTHH-mm-ssZ"), + "modification_date": xmlrpc.client.DateTime( + arrow.utcnow().shift(days=-61).datetime + ), } ] @@ -2687,7 +2688,7 @@ class TestValidateReviewBug: "name": "fedora-review", "status": "+", "setter": assignee, - "modification_date": arrow.utcnow().format("YYYY-MM-DDTHH-mm-ssZ"), + "modification_date": xmlrpc.client.DateTime(arrow.utcnow().datetime), } ] @@ -2743,7 +2744,7 @@ class TestValidateReviewBug: "name": "fedora-review", "status": "+", "setter": assignee, - "modification_date": arrow.utcnow().format("YYYY-MM-DDTHH-mm-ssZ"), + "modification_date": xmlrpc.client.DateTime(arrow.utcnow().datetime), }, { "name": "random-flag", diff --git a/toddlers/plugins/scm_request_processor.py b/toddlers/plugins/scm_request_processor.py index 51c48fa..c8c2bf1 100644 --- a/toddlers/plugins/scm_request_processor.py +++ b/toddlers/plugins/scm_request_processor.py @@ -963,7 +963,7 @@ class SCMRequestProcessor(ToddlerBase): update_dt = flag.get("modification_date") if update_dt: - dt = arrow.get(update_dt, "YYYY-MM-DDTHH-mm-ssZ") + dt = arrow.get(update_dt.value, "YYYYMMDDTHH:mm:ss") delta = arrow.utcnow().date() - dt.date() if delta.days > 60: raise ValidationError(