From 7c8c2e23d87c437a124915c26bf2c2725fb35e10 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: May 19 2020 16:45:53 +0000
Subject: [PATCH 1/3] Remove unncecessary test


This test, as it is, curently fails in Jenkins. But it doesn't add
no extra coverage and can be removed.

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/test/test_commands.py b/test/test_commands.py
index 7020d15..5ee3a92 100644
--- a/test/test_commands.py
+++ b/test/test_commands.py
@@ -312,10 +312,6 @@ class TestFindMasterBranch(CommandTestCase):
         koji_session.getBuildTarget.assert_called_once_with('rawhide')
         self.assertEqual('28', result)
 
-    def test_find_from_fedora_branches(self):
-        result = self.cmd._findmasterbranch()
-        self.assertEqual(28, result)
-
     @patch('pyrpkg.Commands.anon_kojisession', new_callable=PropertyMock)
     @patch('pyrpkg.Commands.repo', new_callable=PropertyMock)
     def test_get_from_koji_for_the_last_chance(self, repo, anon_kojisession):

From 2daee5c56cf8b2f53b7145f0c6ca5809f641c69c Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: May 19 2020 16:46:18 +0000
Subject: [PATCH 2/3] display_name added to bodhi.template


User is able to set 'display_name' during bodhi update operation which
allows the user to customize the name of the update.

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/fedpkg/cli.py b/fedpkg/cli.py
index 842d844..6e0d4ab 100644
--- a/fedpkg/cli.py
+++ b/fedpkg/cli.py
@@ -56,6 +56,8 @@ bugs=%(bugs)s
 # This is required for security updates.
 # severity=unspecified
 
+display_name=
+
 %(changelog)s
 # Here is where you give an explanation of your update.
 # Content can span multiple lines, as long as they are indented deeper than
@@ -692,6 +694,7 @@ class fedpkgClient(cliClient):
         bodhi_args = {
             'nvr': nvr,
             'bugs': six.u(''),
+            'display_name': six.u(''),
             'descr': six.u(
                 'Here is where you give an explanation of your update.'),
             'request': self.args.request,
diff --git a/test/test_cli.py b/test/test_cli.py
index c22eefd..0376ded 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -179,6 +179,7 @@ class TestUpdate(CliTestCase):
         expected_data = {
             'autokarma': 'True',
             'bugs': '1000,2000',
+            'display_name': six.u(''),
             'builds': ' {0} '.format(self.mock_nvr.return_value),
             'close_bugs': True,
             'request': 'testing',

From 78cc575777ed568839d5872bfbe6b95fadb3143c Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: May 19 2020 16:46:18 +0000
Subject: [PATCH 3/3] Fix unittest for bodhi based on its version


JIRA: RHELCMP-587

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/test/test_cli.py b/test/test_cli.py
index 0376ded..3a9e021 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -128,6 +128,16 @@ class TestUpdate(CliTestCase):
         with io.open(clog_file, 'w', encoding='utf-8') as f:
             f.write(os.linesep.join(self.fake_clog))
 
+        # Get 'bodhi_client' version. Particular versions have differences
+        # across distributions.
+        self.bodhi_version = None
+        try:
+            version_object = pkg_resources.get_distribution('bodhi_client')
+            if version_object.has_version():
+                self.bodhi_version = int(version_object.version.split('.')[0])
+        except pkg_resources.DistributionNotFound:
+            pass
+
     def tearDown(self):
         if os.path.exists('bodhi.template'):
             os.unlink('bodhi.template')
@@ -196,6 +206,11 @@ class TestUpdate(CliTestCase):
         else:
             expected_data['notes'] = self.fake_clog[0]
 
+        # there wasn't the option in older releases of bodhi, but these
+        # releases are still active (epel7, epel8)
+        if self.bodhi_version <= 4:
+            del expected_data["display_name"]
+
         with patch('os.unlink') as unlink:
             cli.update()