Test reorganization and cleanup. (#18270)

- Correct directory name in test/README.md - Move code-smell tests to test/sanity/code-smell - Update code-smell.sh to use new script paths - Add test/integration/target-prefixes.win for ansible-test - Move module unit tests to match module directory layout
8 years ago · 71819c0a60
parent 02859a3e32
commit 71819c0a60
15 changed files with 7 additions and 6 deletions
--- a/test/README.md
+++ b/test/README.md
@ -4,8 +4,8 @@ Ansible Test System
 Folders
 =======

-unit
----
+units
+-----

 Unit tests that test small pieces of code not suited for the integration test layer, usually very API based, and should leverage
 mock interfaces rather than producing side effects.
--- a/test/integration/target-prefixes.win
+++ b/test/integration/target-prefixes.win
@ -0,0 +1 @@
+win
--- a/test/sanity/code-smell/boilerplate.sh
+++ b/test/sanity/code-smell/boilerplate.sh
--- a/test/sanity/code-smell/inappropriately-private.sh
+++ b/test/sanity/code-smell/inappropriately-private.sh
--- a/test/sanity/code-smell/no-basestring.sh
+++ b/test/sanity/code-smell/no-basestring.sh
--- a/test/sanity/code-smell/replace-urlopen.sh
+++ b/test/sanity/code-smell/replace-urlopen.sh
--- a/test/sanity/code-smell/required-and-default-attributes.sh
+++ b/test/sanity/code-smell/required-and-default-attributes.sh
--- a/test/sanity/code-smell/use-compat-six.sh
+++ b/test/sanity/code-smell/use-compat-six.sh
--- a/test/units/modules/core/cloud/init.py
+++ b/test/units/modules/core/cloud/init.py
--- a/test/units/modules/core/cloud/docker/init.py
+++ b/test/units/modules/core/cloud/docker/init.py
--- a/test/units/modules/core/cloud/docker/test_docker.py
+++ b/test/units/modules/core/cloud/docker/test_docker.py
--- a/test/units/modules/core/packaging/init.py
+++ b/test/units/modules/core/packaging/init.py
--- a/test/units/modules/core/packaging/os/init.py
+++ b/test/units/modules/core/packaging/os/init.py
--- a/test/units/modules/core/packaging/os/test_apt.py
+++ b/test/units/modules/core/packaging/os/test_apt.py
--- a/test/utils/shippable/code-smell.sh
+++ b/test/utils/shippable/code-smell.sh
@ -16,10 +16,10 @@ if [ "${install_deps}" != "" ]; then
 fi

 yamllint .
-test/code-smell/replace-urlopen.sh .
-test/code-smell/use-compat-six.sh lib
-test/code-smell/boilerplate.sh
-test/code-smell/required-and-default-attributes.sh
+test/sanity/code-smell/replace-urlopen.sh .
+test/sanity/code-smell/use-compat-six.sh lib
+test/sanity/code-smell/boilerplate.sh
+test/sanity/code-smell/required-and-default-attributes.sh

 shellcheck \
    test/integration/targets/*/*.sh \