saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Keep osmajorrelease as a string type for 2016.3 release

Browse source
This commit is contained in:
Bo Maryniuk 2016-07-19 17:52:08 +02:00
parent 208fd33b48
commit 110a422d5a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -1489,7 +1489,7 @@ def os_data():
continue
osrelease_info[idx] = int(value)
grains['osrelease_info'] = tuple(osrelease_info)
grains['osmajorrelease'] = grains['osrelease_info'][0]
grains['osmajorrelease'] = str(grains['osrelease_info'][0]) ## This will be an integer in the next release
os_name = 'os' if grains.get('os') in ('FreeBSD', 'OpenBSD', 'NetBSD', 'Mac', 'Raspbian') else 'osfullname'
grains['osfinger'] = '{0}-{1}'.format(grains[os_name], grains['osrelease_info'][0])

12
tests/unit/grains/core_test.py
View file

@ -250,7 +250,7 @@ PATCHLEVEL = 3
'osfullname': "SLES",
'osrelease': '11.3',
'osrelease_info': [11, 3],
'osmajorrelease': 11,
'osmajorrelease': '11',
'files': ["/etc/SuSE-release"],
}
self._run_suse_os_grains_tests(_os_release_map)
@ -274,7 +274,7 @@ PATCHLEVEL = 3
'osfullname': "SLES",
'osrelease': '11.4',
'osrelease_info': [11, 4],
'osmajorrelease': 11,
'osmajorrelease': '11',
'files': ["/etc/os-release"],
}
self._run_suse_os_grains_tests(_os_release_map)
@ -298,7 +298,7 @@ PATCHLEVEL = 3
'osfullname': "SLES",
'osrelease': '12',
'osrelease_info': [12],
'osmajorrelease': 12,
'osmajorrelease': '12',
'files': ["/etc/os-release"],
}
self._run_suse_os_grains_tests(_os_release_map)
@ -322,7 +322,7 @@ PATCHLEVEL = 3
'osfullname': "SLES",
'osrelease': '12.1',
'osrelease_info': [12, 1],
'osmajorrelease': 12,
'osmajorrelease': '12',
'files': ["/etc/os-release"],
}
self._run_suse_os_grains_tests(_os_release_map)
@ -346,7 +346,7 @@ PATCHLEVEL = 3
'osfullname': "Leap",
'osrelease': '42.1',
'osrelease_info': [42, 1],
'osmajorrelease': 42,
'osmajorrelease': '42',
'files': ["/etc/os-release"],
}
self._run_suse_os_grains_tests(_os_release_map)
@ -370,7 +370,7 @@ PATCHLEVEL = 3
'osfullname': "Tumbleweed",
'osrelease': '20160504',
'osrelease_info': [20160504],
'osmajorrelease': 20160504,
'osmajorrelease': '20160504',
'files': ["/etc/os-release"],
}
self._run_suse_os_grains_tests(_os_release_map)