From 14853ab513e87dcb93b655a5b922d01adee014e2 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 6 Nov 2016 14:05:38 -0800 Subject: [PATCH 1/3] Fix bug in RHEL6 detection by distributor id. - There are two types of RHEL: server and workstation. - Distributor ID table only had a string for workstation. - Added a string for server. --- distro.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distro.py b/distro.py index 0afa527..ca25339 100755 --- a/distro.py +++ b/distro.py @@ -62,7 +62,8 @@ #: * Value: Normalized value. NORMALIZED_LSB_ID = { 'enterpriseenterprise': 'oracle', # Oracle Enterprise Linux - 'redhatenterpriseworkstation': 'rhel', # RHEL 6.7 + 'redhatenterpriseworkstation': 'rhel', # RHEL 6, 7 Workstation + 'redhatenterpriseserver': 'rhel', # RHEL 6, 7 Server } #: Translation table for normalizing the distro ID derived from the file name From 6de2acc88f400208ca00a58a3048ca80997ba59d Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 22 Nov 2016 10:57:37 -0600 Subject: [PATCH 2/3] Add test for RHEL5 --- .../distros/rhel5/etc/redhat-release | 1 + tests/test_distro.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 tests/resources/distros/rhel5/etc/redhat-release diff --git a/tests/resources/distros/rhel5/etc/redhat-release b/tests/resources/distros/rhel5/etc/redhat-release new file mode 100644 index 0000000..ba7213d --- /dev/null +++ b/tests/resources/distros/rhel5/etc/redhat-release @@ -0,0 +1 @@ +Red Hat Enterprise Linux Server release 5.11 (Tikanga) diff --git a/tests/test_distro.py b/tests/test_distro.py index f80c86f..0947243 100644 --- a/tests/test_distro.py +++ b/tests/test_distro.py @@ -1170,6 +1170,28 @@ def test_raspbian8_release(self): self._test_outcome(desired_outcome) self._test_non_existing_release_file() + def test_rhel5_release(self): + desired_outcome = { + 'id': 'rhel', + 'name': 'Red Hat Enterprise Linux Server', + 'pretty_name': 'Red Hat Enterprise Linux Server release 5.11 (Tikanga)', + 'version': '5.11', + 'pretty_version': '5.11 (Tikanga)', + 'best_version': '5.11', + 'codename': 'Tikanga', + 'major_version': '5', + 'minor_version': '11' + } + self._test_outcome(desired_outcome) + + desired_info = { + 'id': 'redhat', + 'name': 'Red Hat Enterprise Linux Server', + 'version_id': '5.11', + 'codename': 'Tikanga' + } + self._test_release_file_info('redhat-release', desired_info) + def test_rhel6_release(self): desired_outcome = { 'id': 'rhel', From 10b0b81989ebea582ad13bdd368b056a41a515bd Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 22 Nov 2016 16:17:03 -0600 Subject: [PATCH 3/3] Fix tests for RHEL 5 --- tests/test_distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_distro.py b/tests/test_distro.py index 0947243..523074d 100644 --- a/tests/test_distro.py +++ b/tests/test_distro.py @@ -1174,7 +1174,7 @@ def test_rhel5_release(self): desired_outcome = { 'id': 'rhel', 'name': 'Red Hat Enterprise Linux Server', - 'pretty_name': 'Red Hat Enterprise Linux Server release 5.11 (Tikanga)', + 'pretty_name': 'Red Hat Enterprise Linux Server 5.11 (Tikanga)', 'version': '5.11', 'pretty_version': '5.11 (Tikanga)', 'best_version': '5.11',