From 2d7e34545398c55850e3e7736d0de593fd92e20c Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Feb 14 2018 05:25:03 +0000
Subject: Do not check bodhi-client version


So far, EL6 is still needed to be considered for fedpkg, so
bodhi-client 1.x must be supported as well.

This patch does not check bodhi-client version to select proper version
of bodhi-client. Instead, if current system is EL6, version 1.x is
selected, otherwise bodhi command line will be constructed in the 2.x
format. This avoids fedpkg to be updated and released when each time a
new version of bodhi-client with increased major version is released.

Fixes #171

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
index dd1c2d9..59a1dd9 100644
--- a/fedpkg/__init__.py
+++ b/fedpkg/__init__.py
@@ -14,11 +14,11 @@ import os
 import git
 import re
 import platform
-import subprocess
 
 from . import cli  # noqa
 from .lookaside import FedoraLookasideCache
 from pyrpkg.utils import cached_property
+from .utils import is_el6_system
 
 
 class Commands(pyrpkg.Commands):
@@ -228,42 +228,22 @@ class Commands(pyrpkg.Commands):
 
     def update(self, bodhi_config, template='bodhi.template', bugs=[]):
         """Submit an update to bodhi using the provided template."""
-
         # build up the bodhi arguments, based on which version of bodhi is
         # installed
-        bodhi_major_version = _get_bodhi_version()[0]
-        if bodhi_major_version < 2:
+        if is_el6_system():
             cmd = ['bodhi', '--bodhi-url', bodhi_config['url'],
                    '--new', '--release', self.branch_merge,
                    '--file', 'bodhi.template', self.nvr, '--username',
                    self.user]
-        elif bodhi_major_version < 4:
-            # Version 3 is compatible with 2, it was bumped for server side
-            # reasons.
+        else:
             cmd = ['bodhi', 'updates', 'new', '--file', 'bodhi.template',
                    '--user', self.user]
             if bodhi_config['staging']:
                 cmd.append('--staging')
             cmd.append(self.nvr)
-        else:
-            msg = 'This system has bodhi v{0}, which is unsupported.'
-            msg = msg.format(bodhi_major_version)
-            raise Exception(msg)
         self._run_command(cmd, shell=True)
 
 
-def _get_bodhi_version():
-    """
-    Use bodhi --version to determine the version of the Bodhi CLI that's
-    installed on the system, then return a list of the version components.
-    For example, if bodhi --version returns "2.1.9", this function will return
-    [2, 1, 9].
-    """
-    bodhi = subprocess.Popen(['bodhi', '--version'], stdout=subprocess.PIPE)
-    version = bodhi.communicate()[0].strip()
-    return [int(component) for component in version.split('.')]
-
-
 if __name__ == "__main__":
     from fedpkg.__main__ import main
     main()
diff --git a/fedpkg/utils.py b/fedpkg/utils.py
index d241308..6d91944 100644
--- a/fedpkg/utils.py
+++ b/fedpkg/utils.py
@@ -11,6 +11,7 @@
 # the full text of the license.
 
 import re
+import rpm
 import json
 from datetime import datetime
 
@@ -196,6 +197,15 @@ def is_epel(branch):
     return bool(re.match(r'^(?:el|epel)\d+$', branch))
 
 
+def is_el6_system():
+    """Check if current system is EL6
+
+    :return: True if current system is EL6. Otherwise False is returned.
+    :rtype: bool
+    """
+    return '.el6' == rpm.expandMacro('%{dist}')
+
+
 def assert_valid_epel_package(name, branch):
     """
     Determines if the package is allowed to have an EPEL branch. If it can't,
diff --git a/test/test_cli.py b/test/test_cli.py
index 047b962..97596f7 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -43,9 +43,9 @@ class TestUpdate(CliTestCase):
         self.mock_run_command = self.run_command_patcher.start()
 
         # Let's always use the bodhi 2 command line to test here
-        self.get_bodhi_version_patcher = patch('fedpkg._get_bodhi_version',
-                                               return_value=[2, 11, 0])
-        self.mock_get_bodhi_version = self.get_bodhi_version_patcher.start()
+        self.is_el6_system_patcher = patch('fedpkg.is_el6_system',
+                                           return_value=False)
+        self.mock_is_el6_system = self.is_el6_system_patcher.start()
 
         # Not write clog actually. Instead, file object will be mocked and
         # return fake clog content for tests.
@@ -64,7 +64,7 @@ class TestUpdate(CliTestCase):
     def tearDown(self):
         self.os_environ_patcher.stop()
         self.clog_patcher.stop()
-        self.get_bodhi_version_patcher.stop()
+        self.is_el6_system_patcher.stop()
         self.run_command_patcher.stop()
         self.nvr_patcher.stop()
         super(TestUpdate, self).tearDown()
@@ -151,28 +151,10 @@ class TestUpdate(CliTestCase):
     @patch('os.path.isfile', return_value=True)
     @patch('hashlib.new')
     @patch('fedpkg.lookaside.FedoraLookasideCache.hash_file')
-    def test_fail_if_bodhi_version_is_not_supported(
-            self, hash_file, hashlib_new, isfile):
-        # As of writing this test, only supports version v3, v2, and <v2.
-        self.mock_get_bodhi_version.return_value = [4, 1, 2]
-        hashlib_new.return_value.hexdigest.return_value = 'origin hash'
-        hash_file.return_value = 'different hash'
-
-        cli_cmd = ['fedpkg', '--path', self.cloned_repo_path, 'update']
-
-        cli = self.get_cli(cli_cmd)
-        six.assertRaisesRegex(
-            self, rpkgError, 'This system has bodhi v4, which is unsupported',
-            self.create_bodhi_update, cli)
-
-    @patch('os.path.isfile', return_value=True)
-    @patch('hashlib.new')
-    @patch('fedpkg.lookaside.FedoraLookasideCache.hash_file')
     @patch('fedpkg.Commands.user', new_callable=PropertyMock)
     def test_create_update_in_stage_bodhi(
             self, user, hash_file, hashlib_new, isfile):
         user.return_value = 'someone'
-        self.mock_get_bodhi_version.return_value = [2, 8, 1]
         hashlib_new.return_value.hexdigest.return_value = 'origin hash'
         hash_file.return_value = 'different hash'
 
diff --git a/test/test_commands.py b/test/test_commands.py
index acbf5e4..377ac09 100644
--- a/test/test_commands.py
+++ b/test/test_commands.py
@@ -9,10 +9,7 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import unittest
-
 from pyrpkg.errors import rpkgError
-from fedpkg import _get_bodhi_version
 from utils import CommandTestCase
 from mock import call, patch, Mock, PropertyMock, mock_open
 from six.moves import builtins
@@ -141,17 +138,6 @@ class TestLoadUser(CommandTestCase):
         self.assertEqual('someone', self.cmd._user)
 
 
-class GetBodhiVersion(unittest.TestCase):
-    """Test fedpkg._get_bodhi_version"""
-
-    @patch('subprocess.Popen')
-    def test_get_bodhi_version(self, Popen):
-        Popen.return_value.communicate.return_value = ('1.2.3\n', '')
-
-        version = _get_bodhi_version()
-        self.assertEqual([1, 2, 3], version)
-
-
 class TestLookaside(CommandTestCase):
     """Test Commands.lookasidecache"""
 
diff --git a/test/test_utils.py b/test/test_utils.py
index cff22bd..92f98c9 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -141,3 +141,11 @@ class TestUtils(CliTestCase):
         expected = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
         actual = utils.get_release_branches('http://bodhi.local')
         self.assertEqual(expected, actual)
+
+    @patch('fedpkg.utils.rpm.expandMacro')
+    def test_is_el6_system(self, expandMacro):
+        expandMacro.return_value = '.el6'
+        self.assertTrue(utils.is_el6_system())
+
+        expandMacro.return_value = '.fc27'
+        self.assertFalse(utils.is_el6_system())