valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update grains unit tests: osmajorrelease grain is a str, not an int.

Browse Source 
Refs #35227

These tests will need to be changed back to integers once Nitrogen
is released.
This commit is contained in:
rallytime 2016-08-11 10:38:58 -06:00
parent 8bf7ad859a
commit 69b9342d67
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/grains/core_test.py
View File

@ -263,7 +263,7 @@ PATCHLEVEL = 3
'osfullname': "SLES", 'osfullname': "SLES",
'osrelease': '11.3', 'osrelease': '11.3',
'osrelease_info': [11, 3], 'osrelease_info': [11, 3],
'osmajorrelease': 11, 'osmajorrelease': '11',
'files': ["/etc/SuSE-release"], 'files': ["/etc/SuSE-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@ -287,7 +287,7 @@ PATCHLEVEL = 3
'osfullname': "SLES", 'osfullname': "SLES",
'osrelease': '11.4', 'osrelease': '11.4',
'osrelease_info': [11, 4], 'osrelease_info': [11, 4],
'osmajorrelease': 11, 'osmajorrelease': '11',
'files': ["/etc/os-release"], 'files': ["/etc/os-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@ -311,7 +311,7 @@ PATCHLEVEL = 3
'osfullname': "SLES", 'osfullname': "SLES",
'osrelease': '12', 'osrelease': '12',
'osrelease_info': [12], 'osrelease_info': [12],
'osmajorrelease': 12, 'osmajorrelease': '12',
'files': ["/etc/os-release"], 'files': ["/etc/os-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@ -335,7 +335,7 @@ PATCHLEVEL = 3
'osfullname': "SLES", 'osfullname': "SLES",
'osrelease': '12.1', 'osrelease': '12.1',
'osrelease_info': [12, 1], 'osrelease_info': [12, 1],
'osmajorrelease': 12, 'osmajorrelease': '12',
'files': ["/etc/os-release"], 'files': ["/etc/os-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@ -359,7 +359,7 @@ PATCHLEVEL = 3
'osfullname': "Leap", 'osfullname': "Leap",
'osrelease': '42.1', 'osrelease': '42.1',
'osrelease_info': [42, 1], 'osrelease_info': [42, 1],
'osmajorrelease': 42, 'osmajorrelease': '42',
'files': ["/etc/os-release"], 'files': ["/etc/os-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@ -383,13 +383,13 @@ PATCHLEVEL = 3
'osfullname': "Tumbleweed", 'osfullname': "Tumbleweed",
'osrelease': '20160504', 'osrelease': '20160504',
'osrelease_info': [20160504], 'osrelease_info': [20160504],
'osmajorrelease': 20160504, 'osmajorrelease': '20160504',
'files': ["/etc/os-release"], 'files': ["/etc/os-release"],
} }
self._run_suse_os_grains_tests(_os_release_map) self._run_suse_os_grains_tests(_os_release_map)
@skipIf(not salt.utils.is_linux(), 'System is not Linux') @skipIf(not salt.utils.is_linux(), 'System is not Linux')
def test_suse_os_grains_ubuntu(self): def test_ubuntu_os_grains(self):
''' '''
Test if OS grains are parsed correctly in Ubuntu Xenial Xerus Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
''' '''