summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2020-03-19 09:37:37 -0700
committerMatt Clay <matt@mystile.com>2020-03-19 09:50:36 -0700
commit9d0113be5cc5797e8afe9daadada7ca2d1422ba8 (patch)
treeaf0efc7bd601978dabb35f1466fb707ba75a389d
parent9237c4f788d5ceb6f1fd23ef956c590703dcc3bd (diff)
downloadansible-9d0113be5cc5797e8afe9daadada7ca2d1422ba8.tar.gz
Fix shebang sanity test module identification.
-rw-r--r--changelogs/fragments/ansible-test-shebang-sanity.yml2
-rwxr-xr-xtest/lib/ansible_test/_data/sanity/code-smell/shebang.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/changelogs/fragments/ansible-test-shebang-sanity.yml b/changelogs/fragments/ansible-test-shebang-sanity.yml
new file mode 100644
index 0000000000..9159d72155
--- /dev/null
+++ b/changelogs/fragments/ansible-test-shebang-sanity.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - ansible-test - The shebang sanity test now correctly identifies modules in subdirectories in collections.
diff --git a/test/lib/ansible_test/_data/sanity/code-smell/shebang.py b/test/lib/ansible_test/_data/sanity/code-smell/shebang.py
index bbfeed532a..7cf3cf7200 100755
--- a/test/lib/ansible_test/_data/sanity/code-smell/shebang.py
+++ b/test/lib/ansible_test/_data/sanity/code-smell/shebang.py
@@ -88,7 +88,7 @@ def main():
'test/integration/targets/module_precedence/lib_with_extension',
):
is_module = True
- elif dirname == 'plugins/modules':
+ elif path.startswith('plugins/modules/'):
is_module = True
if is_module: