From 383ef3ea80bcb269d10b4fb2be23c7146d78242d Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 19 Mar 2020 22:05:43 -0700 Subject: [PATCH] Rename tests (#68356) * Rename `tests` test to match plugin type. * Rename `test_infra` test to avoid confusion. This test target is not a test for test plugins. * Rename `vars_prompt` test to avoid confusion. * Update sanity ignores. --- .../targets/{vars_prompt => builtin_vars_prompt}/aliases | 0 .../targets/{vars_prompt => builtin_vars_prompt}/runme.sh | 0 .../test-vars_prompt.py | 0 .../{vars_prompt => builtin_vars_prompt}/unsafe.yml | 0 .../{vars_prompt => builtin_vars_prompt}/unsupported.yml | 0 .../vars_prompt-1.yml | 0 .../vars_prompt-2.yml | 0 .../vars_prompt-3.yml | 0 .../vars_prompt-4.yml | 0 .../vars_prompt-5.yml | 0 .../vars_prompt-6.yml | 0 .../vars_prompt-7.yml | 0 test/integration/targets/{test_infra => infra}/aliases | 0 .../targets/{test_infra => infra}/inventory.local | 0 .../targets/{test_infra => infra}/library/test.py | 0 test/integration/targets/{test_infra => infra}/runme.sh | 0 .../targets/{test_infra => infra}/test_test_infra.yml | 0 test/integration/targets/{tests => test_core}/aliases | 0 .../targets/{tests => test_core}/tasks/main.yml | 0 test/sanity/ignore.txt | 8 ++++---- 20 files changed, 4 insertions(+), 4 deletions(-) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/aliases (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/runme.sh (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/test-vars_prompt.py (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/unsafe.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/unsupported.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-1.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-2.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-3.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-4.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-5.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-6.yml (100%) rename test/integration/targets/{vars_prompt => builtin_vars_prompt}/vars_prompt-7.yml (100%) rename test/integration/targets/{test_infra => infra}/aliases (100%) rename test/integration/targets/{test_infra => infra}/inventory.local (100%) rename test/integration/targets/{test_infra => infra}/library/test.py (100%) rename test/integration/targets/{test_infra => infra}/runme.sh (100%) rename test/integration/targets/{test_infra => infra}/test_test_infra.yml (100%) rename test/integration/targets/{tests => test_core}/aliases (100%) rename test/integration/targets/{tests => test_core}/tasks/main.yml (100%) diff --git a/test/integration/targets/vars_prompt/aliases b/test/integration/targets/builtin_vars_prompt/aliases similarity index 100% rename from test/integration/targets/vars_prompt/aliases rename to test/integration/targets/builtin_vars_prompt/aliases diff --git a/test/integration/targets/vars_prompt/runme.sh b/test/integration/targets/builtin_vars_prompt/runme.sh similarity index 100% rename from test/integration/targets/vars_prompt/runme.sh rename to test/integration/targets/builtin_vars_prompt/runme.sh diff --git a/test/integration/targets/vars_prompt/test-vars_prompt.py b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py similarity index 100% rename from test/integration/targets/vars_prompt/test-vars_prompt.py rename to test/integration/targets/builtin_vars_prompt/test-vars_prompt.py diff --git a/test/integration/targets/vars_prompt/unsafe.yml b/test/integration/targets/builtin_vars_prompt/unsafe.yml similarity index 100% rename from test/integration/targets/vars_prompt/unsafe.yml rename to test/integration/targets/builtin_vars_prompt/unsafe.yml diff --git a/test/integration/targets/vars_prompt/unsupported.yml b/test/integration/targets/builtin_vars_prompt/unsupported.yml similarity index 100% rename from test/integration/targets/vars_prompt/unsupported.yml rename to test/integration/targets/builtin_vars_prompt/unsupported.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-1.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-1.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-1.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-1.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-2.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-2.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-2.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-2.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-3.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-3.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-3.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-3.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-4.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-4.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-4.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-4.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-5.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-5.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-5.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-5.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-6.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-6.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-6.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-6.yml diff --git a/test/integration/targets/vars_prompt/vars_prompt-7.yml b/test/integration/targets/builtin_vars_prompt/vars_prompt-7.yml similarity index 100% rename from test/integration/targets/vars_prompt/vars_prompt-7.yml rename to test/integration/targets/builtin_vars_prompt/vars_prompt-7.yml diff --git a/test/integration/targets/test_infra/aliases b/test/integration/targets/infra/aliases similarity index 100% rename from test/integration/targets/test_infra/aliases rename to test/integration/targets/infra/aliases diff --git a/test/integration/targets/test_infra/inventory.local b/test/integration/targets/infra/inventory.local similarity index 100% rename from test/integration/targets/test_infra/inventory.local rename to test/integration/targets/infra/inventory.local diff --git a/test/integration/targets/test_infra/library/test.py b/test/integration/targets/infra/library/test.py similarity index 100% rename from test/integration/targets/test_infra/library/test.py rename to test/integration/targets/infra/library/test.py diff --git a/test/integration/targets/test_infra/runme.sh b/test/integration/targets/infra/runme.sh similarity index 100% rename from test/integration/targets/test_infra/runme.sh rename to test/integration/targets/infra/runme.sh diff --git a/test/integration/targets/test_infra/test_test_infra.yml b/test/integration/targets/infra/test_test_infra.yml similarity index 100% rename from test/integration/targets/test_infra/test_test_infra.yml rename to test/integration/targets/infra/test_test_infra.yml diff --git a/test/integration/targets/tests/aliases b/test/integration/targets/test_core/aliases similarity index 100% rename from test/integration/targets/tests/aliases rename to test/integration/targets/test_core/aliases diff --git a/test/integration/targets/tests/tasks/main.yml b/test/integration/targets/test_core/tasks/main.yml similarity index 100% rename from test/integration/targets/tests/tasks/main.yml rename to test/integration/targets/test_core/tasks/main.yml diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index c3b62ef6f4f..abe067b72d8 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -331,15 +331,15 @@ test/integration/targets/template/files/foo.dos.txt line-endings test/integration/targets/template/role_filter/filter_plugins/myplugin.py future-import-boilerplate test/integration/targets/template/role_filter/filter_plugins/myplugin.py metaclass-boilerplate test/integration/targets/template/templates/encoding_1252.j2 no-smart-quotes -test/integration/targets/test_infra/library/test.py future-import-boilerplate -test/integration/targets/test_infra/library/test.py metaclass-boilerplate +test/integration/targets/infra/library/test.py future-import-boilerplate +test/integration/targets/infra/library/test.py metaclass-boilerplate test/integration/targets/unicode/unicode.yml no-smart-quotes test/integration/targets/uri/files/testserver.py future-import-boilerplate test/integration/targets/uri/files/testserver.py metaclass-boilerplate test/integration/targets/var_precedence/ansible-var-precedence-check.py future-import-boilerplate test/integration/targets/var_precedence/ansible-var-precedence-check.py metaclass-boilerplate -test/integration/targets/vars_prompt/test-vars_prompt.py future-import-boilerplate -test/integration/targets/vars_prompt/test-vars_prompt.py metaclass-boilerplate +test/integration/targets/builtin_vars_prompt/test-vars_prompt.py future-import-boilerplate +test/integration/targets/builtin_vars_prompt/test-vars_prompt.py metaclass-boilerplate test/integration/targets/vault/test-vault-client.py future-import-boilerplate test/integration/targets/vault/test-vault-client.py metaclass-boilerplate test/integration/targets/wait_for/files/testserver.py future-import-boilerplate