summaryrefslogtreecommitdiff
path: root/hacking/tests
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2018-01-20 15:05:53 -0500
committerGitHub <noreply@github.com>2018-01-20 15:05:53 -0500
commitec9769c82fc1818b31fd3c4a31de4cba9a5c2ab8 (patch)
tree5b227c94861c127952c46734216f2d76b6f48d14 /hacking/tests
parentfc180a378ad6582c4c4a0d1b972113fd3afb4ae9 (diff)
downloadansible-ec9769c82fc1818b31fd3c4a31de4cba9a5c2ab8.tar.gz
Facts distribution clear linux 31501 (#32453)
The search string used to look for Clear Linux was changed in 45a9f967749ec68e2077fe1d1d32dd37660ab376 to be more specific, but was too specific. Now finding a substring match for 'Clear Linux' in /usr/lib/os-release is enough to consider a match. Since the details of the full name in os-release varies ('Clear Linux Software for Intel Architecture', 'Clear Linux OS for Intel Architecture', etc) the search string match was failing and would fall back to the 'first word in the release file' method resulting in ansible_distribution='NAME="Clear' Also add a meta fact indicating which search string was matched. Test case info from: https://github.com/ansible/ansible/issues/31501#issuecomment-340861535 Fixes #31501
Diffstat (limited to 'hacking/tests')
-rwxr-xr-xhacking/tests/gen_distribution_version_testcase.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py
index bc2ab3c09c..fdd0a058bc 100755
--- a/hacking/tests/gen_distribution_version_testcase.py
+++ b/hacking/tests/gen_distribution_version_testcase.py
@@ -32,6 +32,7 @@ filelist = [
'/etc/altlinux-release',
'/etc/os-release',
'/etc/coreos/update.conf',
+ '/usr/lib/os-release',
]
fcont = {}