From bb2bacd0b9c2ff62c8f5adf3e17efd3cd65589cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Tue, 17 Jan 2023 15:06:09 +0100 Subject: [PATCH] Fix the message to bugzilla without packagers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Red Hat Bugzilla mail field is now being honored by toddlers, lets change it to reflect that. Signed-off-by: Michal Konečný --- .../test_packagers_without_bugzilla.py | 40 +++++-------------- tests/utils/test_notify.py | 13 ++---- toddlers/utils/notify.py | 13 ++---- 3 files changed, 16 insertions(+), 50 deletions(-) diff --git a/tests/plugins/test_packagers_without_bugzilla.py b/tests/plugins/test_packagers_without_bugzilla.py index 232ab6a..1e1b6a8 100644 --- a/tests/plugins/test_packagers_without_bugzilla.py +++ b/tests/plugins/test_packagers_without_bugzilla.py @@ -192,21 +192,11 @@ class TestPackagersWithoutBugzillaToddler: "churchyard@fp.o\n\n" "which bugzilla is telling us is not an account in bugzilla. If you could\n" "please set up an account in bugzilla with this address or change your email\n" - "address on your Fedora Account to match an existing bugzilla account this " - "would\n" - "let us go forward.\n\n" - "Note #1: The new Fedora Account System (FAS) has a new field: bugzilla " - "email,\n" - "however that field is not currently supported by our tooling, so " - "unfortunately\n" - "until our tool can make use of this field, the primary email set in FAS " - "needs to\n" - "match a valid bugzilla account. If you recently changed your account " - "settings to\n" - "make use of this field, it could explain the reason why you are receiving " - "this\n" - "email.\n\n" - "Note #2: this message is being generated by an automated script. You'll\n" + "address (either Red Hat Bugzilla email or Fedora Account email) on your " + "Fedora\n" + "Account to match an existing bugzilla account this " + "would let us go forward.\n\n" + "Note #1: this message is being generated by an automated script. You'll\n" "continue getting this message until the problem is resolved. Sorry for the\n" "inconvenience.\n\nThank you,\nThe Fedora Account System\nadmin@fp.o\n\n\n" "[1] the source of this information is the following JSON file:\n" @@ -235,21 +225,11 @@ class TestPackagersWithoutBugzillaToddler: "python-sig@lists.fp.o\n\n" "which bugzilla is telling us is not an account in bugzilla. If you could\n" "please set up an account in bugzilla with this address or change your email\n" - "address on your Fedora Account to match an existing bugzilla account this " - "would\n" - "let us go forward.\n\n" - "Note #1: The new Fedora Account System (FAS) has a new field: bugzilla " - "email,\n" - "however that field is not currently supported by our tooling, so " - "unfortunately\n" - "until our tool can make use of this field, the primary email set in FAS " - "needs to\n" - "match a valid bugzilla account. If you recently changed your account " - "settings to\n" - "make use of this field, it could explain the reason why you are receiving " - "this\n" - "email.\n\n" - "Note #2: this message is being generated by an automated script. You'll\n" + "address (either Red Hat Bugzilla email or Fedora Account email) on your " + "Fedora\n" + "Account to match an existing bugzilla account this " + "would let us go forward.\n\n" + "Note #1: this message is being generated by an automated script. You'll\n" "continue getting this message until the problem is resolved. Sorry for the\n" "inconvenience.\n\nThank you,\nThe Fedora Account System\nadmin@fp.o\n\n\n" "[1] the source of this information is the following JSON file:\n" diff --git a/tests/utils/test_notify.py b/tests/utils/test_notify.py index 841a0cf..ce7099e 100644 --- a/tests/utils/test_notify.py +++ b/tests/utils/test_notify.py @@ -28,17 +28,10 @@ pingou@email which bugzilla is telling us is not an account in bugzilla. If you could please set up an account in bugzilla with this address or change your email -address on your Fedora Account to match an existing bugzilla account this would -let us go forward. +address (either Red Hat Bugzilla email or Fedora Account email) on your Fedora +Account to match an existing bugzilla account this would let us go forward. -Note #1: The new Fedora Account System (FAS) has a new field: bugzilla email, -however that field is not currently supported by our tooling, so unfortunately -until our tool can make use of this field, the primary email set in FAS needs to -match a valid bugzilla account. If you recently changed your account settings to -make use of this field, it could explain the reason why you are receiving this -email. - -Note #2: this message is being generated by an automated script. You'll +Note #1: this message is being generated by an automated script. You'll continue getting this message until the problem is resolved. Sorry for the inconvenience. diff --git a/toddlers/utils/notify.py b/toddlers/utils/notify.py index 0fc9ddc..74d932c 100644 --- a/toddlers/utils/notify.py +++ b/toddlers/utils/notify.py @@ -23,17 +23,10 @@ At the moment you have: which bugzilla is telling us is not an account in bugzilla. If you could please set up an account in bugzilla with this address or change your email -address on your Fedora Account to match an existing bugzilla account this would -let us go forward. +address (either Red Hat Bugzilla email or Fedora Account email) on your Fedora +Account to match an existing bugzilla account this would let us go forward. -Note #1: The new Fedora Account System (FAS) has a new field: bugzilla email, -however that field is not currently supported by our tooling, so unfortunately -until our tool can make use of this field, the primary email set in FAS needs to -match a valid bugzilla account. If you recently changed your account settings to -make use of this field, it could explain the reason why you are receiving this -email. - -Note #2: this message is being generated by an automated script. You'll +Note #1: this message is being generated by an automated script. You'll continue getting this message until the problem is resolved. Sorry for the inconvenience.