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

tests: Dissolve _run_ubuntu_os_grains_tests

Browse source 
_run_ubuntu_os_grains_tests is only used once and does not provide any
useful abstraction since the introduction of _run_os_grains_tests.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
This commit is contained in:
Benjamin Drung 2018-02-22 14:20:50 +01:00
parent 1d6ef731fe
commit eee1fe5b38
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/unit/grains/test_core.py
View file

@ -415,6 +415,7 @@ PATCHLEVEL = 3
Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
'''
_os_release_map = {
'linux_distribution': ('Ubuntu', '16.04', 'xenial'),
'os_release_file': {
'NAME': 'Ubuntu',
'VERSION': '16.04.1 LTS (Xenial Xerus)',
@ -422,21 +423,17 @@ PATCHLEVEL = 3
'PRETTY_NAME': '',
'ID': 'ubuntu',
},
'os': 'Ubuntu',
'os_family': 'Debian',
'oscodename': 'xenial',
'osfullname': 'Ubuntu',
'osrelease': '16.04',
'osrelease_info': [16, 4],
'osmajorrelease': 16,
'osfinger': 'Ubuntu-16.04',
'files': '/etc/os-release',
}
self._run_ubuntu_os_grains_tests(_os_release_map)
def _run_ubuntu_os_grains_tests(self, os_release_map):
os_release_map['linux_distribution'] = ('Ubuntu', '16.04', 'xenial')
os_release_map['os'] = 'Ubuntu'
os_release_map['os_family'] = 'Debian'
os_release_map['files'] = '/etc/os-release'
self._run_os_grains_tests(os_release_map)
self._run_os_grains_tests(_os_release_map)
def test_docker_virtual(self):
'''