mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
77d5356aba
Use the full content of /etc/os-release for the Ubuntu 16.04 (artful)
os_grains test case. This reveals a bug that 'oscodename' is not
correctly calculated if /etc/os-release provides PRETTY_NAME:
FAIL: test_ubuntu_os_grains (tests.unit.grains.test_core.CoreGrainsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "tests/unit/grains/test_core.py", line 439, in test_ubuntu_os_grains
self._run_ubuntu_os_grains_tests(_os_release_map)
File "tests/unit/grains/test_core.py", line 446, in _run_ubuntu_os_grains_tests
self._run_os_grains_tests(os_release_map)
File "tests/unit/grains/test_core.py", line 262, in _run_os_grains_tests
self.assertEqual(os_grains.get('oscodename'), os_release_map['oscodename'])
AssertionError: 'Ubuntu 16.04.3 LTS' != 'xenial'
- Ubuntu 16.04.3 LTS
+ xenial
fixes #34423 for Ubuntu
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
13 lines
335 B
Plaintext
13 lines
335 B
Plaintext
# Taken from base-files 9.4ubuntu4.5
|
|
NAME="Ubuntu"
|
|
VERSION="16.04.3 LTS (Xenial Xerus)"
|
|
ID=ubuntu
|
|
ID_LIKE=debian
|
|
PRETTY_NAME="Ubuntu 16.04.3 LTS"
|
|
VERSION_ID="16.04"
|
|
HOME_URL="http://www.ubuntu.com/"
|
|
SUPPORT_URL="http://help.ubuntu.com/"
|
|
BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
|
|
VERSION_CODENAME=xenial
|
|
UBUNTU_CODENAME=xenial
|