diff --git a/distro.py b/distro.py index 1518bee..caf37a7 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 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 1daf3ac..726d765 100644 --- a/tests/test_distro.py +++ b/tests/test_distro.py @@ -1123,6 +1123,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 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',