Skip to content

Mend tgamblin branch #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nir0s merged 3 commits into from
Feb 8, 2017
Merged

Mend tgamblin branch #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb9de6
Fix bug in RHEL6 detection by distributor id.
tgamblin Nov 6, 2016
8f0bf67
Add test for RHEL5
adamjstewart Nov 22, 2016
c33284a
Fix tests for RHEL 5
adamjstewart Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/resources/distros/rhel5/etc/redhat-release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Red Hat Enterprise Linux Server release 5.11 (Tikanga)
22 changes: 22 additions & 0 deletions tests/test_distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down