From 49aa8834b020e9b3c03bc6fd6c2517de4fc1817b Mon Sep 17 00:00:00 2001 From: David Wilson Date: Wed, 4 Apr 2018 15:54:31 +0100 Subject: [PATCH] issue #164: split "examples" out into regression/integration tests. --- examples/playbook/README.md | 9 --------- {examples/playbook => tests/ansible}/.gitignore | 0 {examples/playbook => tests/ansible}/Makefile | 0 tests/ansible/README.md | 8 ++++++++ {examples/playbook => tests/ansible}/all.yml | 0 {examples/playbook => tests/ansible}/ansible.cfg | 3 +-- .../ansible}/compare_output_test.py | 0 .../ansible}/gcloud-ansible-playbook.py | 0 {examples/playbook => tests/ansible}/hosts | 0 {examples/playbook => tests/ansible}/hosts.docker | 0 .../action__low_level_execute_command.yml | 0 .../ansible/integration}/async_polling.yml | 0 .../ansible/integration}/playbook__become_flags.yml | 0 .../ansible/integration}/playbook__delegate_to.yml | 0 .../ansible/integration}/playbook__environment.yml | 0 .../ansible/integration}/runner.yml | 0 .../integration}/runner__builtin_command_module.yml | 2 +- .../runner__custom_bash_old_style_module.yml | 0 .../runner__custom_bash_want_json_module.yml | 0 .../runner__custom_binary_producing_json.yml | 0 .../runner__custom_binary_producing_junk.yml | 0 .../runner__custom_binary_single_null.yml | 0 .../runner__custom_perl_json_args_module.yml | 0 .../runner__custom_perl_want_json_module.yml | 0 .../runner__custom_python_json_args_module.yml | 0 .../runner__custom_python_new_style_module.yml | 0 .../runner__custom_python_want_json_module.yml | 0 .../ansible/integration}/runner__remote_tmp.yml | 0 .../ansible}/modules/bash_return_paths.sh | 0 .../modules/custom_bash_old_style_module.sh | 0 .../modules/custom_bash_want_json_module.sh | 0 .../ansible}/modules/custom_binary_producing_json.c | 0 .../ansible}/modules/custom_binary_producing_junk.c | 0 .../ansible}/modules/custom_binary_single_null | Bin .../modules/custom_perl_json_args_module.pl | 0 .../modules/custom_perl_want_json_module.pl | 0 .../modules/custom_python_json_args_module.py | 0 .../modules/custom_python_new_style_module.py | 0 .../modules/custom_python_want_json_module.py | 0 .../ansible/regression}/issue_109.yml | 0 .../ansible/regression}/issue_113.yml | 0 .../ansible/regression}/issue_118.yml | 0 .../ansible/regression}/issue_122.yml | 0 .../ansible/regression}/issue_131.yml | 0 .../ansible/regression}/issue_140.yml | 0 .../ansible/regression}/issue_152.yml | 0 .../ansible/regression}/issue_152b.yml | 0 .../ansible/regression}/issue_154.yml | 0 .../ansible/regression}/issue_174.yml | 0 .../ansible/regression}/issue_177.yml | 0 .../regression}/roles/issue_109/tasks/main.yml | 0 .../roles/issue_109_add_ssh_key/tasks/main.yml | 0 .../roles/issue_109_gather_facts/tasks/main.yml | 0 .../ansible/regression}/scripts/issue_118_saytrue | 0 .../ansible/regression}/scripts/print_env.sh | 0 55 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 examples/playbook/README.md rename {examples/playbook => tests/ansible}/.gitignore (100%) rename {examples/playbook => tests/ansible}/Makefile (100%) create mode 100644 tests/ansible/README.md rename {examples/playbook => tests/ansible}/all.yml (100%) rename {examples/playbook => tests/ansible}/ansible.cfg (83%) rename {examples/playbook => tests/ansible}/compare_output_test.py (100%) rename {examples/playbook => tests/ansible}/gcloud-ansible-playbook.py (100%) rename {examples/playbook => tests/ansible}/hosts (100%) rename {examples/playbook => tests/ansible}/hosts.docker (100%) rename {examples/playbook => tests/ansible/integration}/action__low_level_execute_command.yml (100%) rename {examples/playbook => tests/ansible/integration}/async_polling.yml (100%) rename {examples/playbook => tests/ansible/integration}/playbook__become_flags.yml (100%) rename {examples/playbook => tests/ansible/integration}/playbook__delegate_to.yml (100%) rename {examples/playbook => tests/ansible/integration}/playbook__environment.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__builtin_command_module.yml (74%) rename {examples/playbook => tests/ansible/integration}/runner__custom_bash_old_style_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_bash_want_json_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_binary_producing_json.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_binary_producing_junk.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_binary_single_null.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_perl_json_args_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_perl_want_json_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_python_json_args_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_python_new_style_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__custom_python_want_json_module.yml (100%) rename {examples/playbook => tests/ansible/integration}/runner__remote_tmp.yml (100%) rename {examples/playbook => tests/ansible}/modules/bash_return_paths.sh (100%) rename {examples/playbook => tests/ansible}/modules/custom_bash_old_style_module.sh (100%) rename {examples/playbook => tests/ansible}/modules/custom_bash_want_json_module.sh (100%) rename {examples/playbook => tests/ansible}/modules/custom_binary_producing_json.c (100%) rename {examples/playbook => tests/ansible}/modules/custom_binary_producing_junk.c (100%) rename {examples/playbook => tests/ansible}/modules/custom_binary_single_null (100%) rename {examples/playbook => tests/ansible}/modules/custom_perl_json_args_module.pl (100%) rename {examples/playbook => tests/ansible}/modules/custom_perl_want_json_module.pl (100%) rename {examples/playbook => tests/ansible}/modules/custom_python_json_args_module.py (100%) rename {examples/playbook => tests/ansible}/modules/custom_python_new_style_module.py (100%) rename {examples/playbook => tests/ansible}/modules/custom_python_want_json_module.py (100%) rename {examples/playbook => tests/ansible/regression}/issue_109.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_113.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_118.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_122.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_131.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_140.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_152.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_152b.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_154.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_174.yml (100%) rename {examples/playbook => tests/ansible/regression}/issue_177.yml (100%) rename {examples/playbook => tests/ansible/regression}/roles/issue_109/tasks/main.yml (100%) rename {examples/playbook => tests/ansible/regression}/roles/issue_109_add_ssh_key/tasks/main.yml (100%) rename {examples/playbook => tests/ansible/regression}/roles/issue_109_gather_facts/tasks/main.yml (100%) rename {examples/playbook => tests/ansible/regression}/scripts/issue_118_saytrue (100%) rename {examples/playbook => tests/ansible/regression}/scripts/print_env.sh (100%) diff --git a/examples/playbook/README.md b/examples/playbook/README.md deleted file mode 100644 index 46fb3777..00000000 --- a/examples/playbook/README.md +++ /dev/null @@ -1,9 +0,0 @@ - -# playbooks Directory - -Although this lives under `examples/`, it is more or less an organically -growing collection of regression tests used for development relating to user -bug reports. - -This will be tidied up over time, meanwhile, the playbooks here are a useful -demonstrator for what does and doesn't work. diff --git a/examples/playbook/.gitignore b/tests/ansible/.gitignore similarity index 100% rename from examples/playbook/.gitignore rename to tests/ansible/.gitignore diff --git a/examples/playbook/Makefile b/tests/ansible/Makefile similarity index 100% rename from examples/playbook/Makefile rename to tests/ansible/Makefile diff --git a/tests/ansible/README.md b/tests/ansible/README.md new file mode 100644 index 00000000..399cec3a --- /dev/null +++ b/tests/ansible/README.md @@ -0,0 +1,8 @@ + +# ``tests/ansible`` Directory + +This is an an organically growing collection of integration and regression +tests used for development and end-user bug reports. + +It will be tidied up over time, meanwhile, the playbooks here are a useful +demonstrator for what does and doesn't work. diff --git a/examples/playbook/all.yml b/tests/ansible/all.yml similarity index 100% rename from examples/playbook/all.yml rename to tests/ansible/all.yml diff --git a/examples/playbook/ansible.cfg b/tests/ansible/ansible.cfg similarity index 83% rename from examples/playbook/ansible.cfg rename to tests/ansible/ansible.cfg index e9ecb706..73da0159 100644 --- a/examples/playbook/ansible.cfg +++ b/tests/ansible/ansible.cfg @@ -2,12 +2,11 @@ inventory = hosts gathering = explicit strategy_plugins = ../../ansible_mitogen/plugins/strategy -#strategy = mitogen_linear library = modules retry_files_enabled = False forks = 50 -# Required by runner__remote_tmp.yml +# Required by integration/runner__remote_tmp.yml remote_tmp = ~/.ansible/mitogen-tests/ [ssh_connection] diff --git a/examples/playbook/compare_output_test.py b/tests/ansible/compare_output_test.py similarity index 100% rename from examples/playbook/compare_output_test.py rename to tests/ansible/compare_output_test.py diff --git a/examples/playbook/gcloud-ansible-playbook.py b/tests/ansible/gcloud-ansible-playbook.py similarity index 100% rename from examples/playbook/gcloud-ansible-playbook.py rename to tests/ansible/gcloud-ansible-playbook.py diff --git a/examples/playbook/hosts b/tests/ansible/hosts similarity index 100% rename from examples/playbook/hosts rename to tests/ansible/hosts diff --git a/examples/playbook/hosts.docker b/tests/ansible/hosts.docker similarity index 100% rename from examples/playbook/hosts.docker rename to tests/ansible/hosts.docker diff --git a/examples/playbook/action__low_level_execute_command.yml b/tests/ansible/integration/action__low_level_execute_command.yml similarity index 100% rename from examples/playbook/action__low_level_execute_command.yml rename to tests/ansible/integration/action__low_level_execute_command.yml diff --git a/examples/playbook/async_polling.yml b/tests/ansible/integration/async_polling.yml similarity index 100% rename from examples/playbook/async_polling.yml rename to tests/ansible/integration/async_polling.yml diff --git a/examples/playbook/playbook__become_flags.yml b/tests/ansible/integration/playbook__become_flags.yml similarity index 100% rename from examples/playbook/playbook__become_flags.yml rename to tests/ansible/integration/playbook__become_flags.yml diff --git a/examples/playbook/playbook__delegate_to.yml b/tests/ansible/integration/playbook__delegate_to.yml similarity index 100% rename from examples/playbook/playbook__delegate_to.yml rename to tests/ansible/integration/playbook__delegate_to.yml diff --git a/examples/playbook/playbook__environment.yml b/tests/ansible/integration/playbook__environment.yml similarity index 100% rename from examples/playbook/playbook__environment.yml rename to tests/ansible/integration/playbook__environment.yml diff --git a/examples/playbook/runner.yml b/tests/ansible/integration/runner.yml similarity index 100% rename from examples/playbook/runner.yml rename to tests/ansible/integration/runner.yml diff --git a/examples/playbook/runner__builtin_command_module.yml b/tests/ansible/integration/runner__builtin_command_module.yml similarity index 74% rename from examples/playbook/runner__builtin_command_module.yml rename to tests/ansible/integration/runner__builtin_command_module.yml index c0b0c6e2..389756d5 100644 --- a/examples/playbook/runner__builtin_command_module.yml +++ b/tests/ansible/integration/runner__builtin_command_module.yml @@ -1,5 +1,5 @@ - hosts: all tasks: - - name: "Run hostname" + - name: builtin_command_module command: hostname with_sequence: start=1 end={{end|default(100)}} diff --git a/examples/playbook/runner__custom_bash_old_style_module.yml b/tests/ansible/integration/runner__custom_bash_old_style_module.yml similarity index 100% rename from examples/playbook/runner__custom_bash_old_style_module.yml rename to tests/ansible/integration/runner__custom_bash_old_style_module.yml diff --git a/examples/playbook/runner__custom_bash_want_json_module.yml b/tests/ansible/integration/runner__custom_bash_want_json_module.yml similarity index 100% rename from examples/playbook/runner__custom_bash_want_json_module.yml rename to tests/ansible/integration/runner__custom_bash_want_json_module.yml diff --git a/examples/playbook/runner__custom_binary_producing_json.yml b/tests/ansible/integration/runner__custom_binary_producing_json.yml similarity index 100% rename from examples/playbook/runner__custom_binary_producing_json.yml rename to tests/ansible/integration/runner__custom_binary_producing_json.yml diff --git a/examples/playbook/runner__custom_binary_producing_junk.yml b/tests/ansible/integration/runner__custom_binary_producing_junk.yml similarity index 100% rename from examples/playbook/runner__custom_binary_producing_junk.yml rename to tests/ansible/integration/runner__custom_binary_producing_junk.yml diff --git a/examples/playbook/runner__custom_binary_single_null.yml b/tests/ansible/integration/runner__custom_binary_single_null.yml similarity index 100% rename from examples/playbook/runner__custom_binary_single_null.yml rename to tests/ansible/integration/runner__custom_binary_single_null.yml diff --git a/examples/playbook/runner__custom_perl_json_args_module.yml b/tests/ansible/integration/runner__custom_perl_json_args_module.yml similarity index 100% rename from examples/playbook/runner__custom_perl_json_args_module.yml rename to tests/ansible/integration/runner__custom_perl_json_args_module.yml diff --git a/examples/playbook/runner__custom_perl_want_json_module.yml b/tests/ansible/integration/runner__custom_perl_want_json_module.yml similarity index 100% rename from examples/playbook/runner__custom_perl_want_json_module.yml rename to tests/ansible/integration/runner__custom_perl_want_json_module.yml diff --git a/examples/playbook/runner__custom_python_json_args_module.yml b/tests/ansible/integration/runner__custom_python_json_args_module.yml similarity index 100% rename from examples/playbook/runner__custom_python_json_args_module.yml rename to tests/ansible/integration/runner__custom_python_json_args_module.yml diff --git a/examples/playbook/runner__custom_python_new_style_module.yml b/tests/ansible/integration/runner__custom_python_new_style_module.yml similarity index 100% rename from examples/playbook/runner__custom_python_new_style_module.yml rename to tests/ansible/integration/runner__custom_python_new_style_module.yml diff --git a/examples/playbook/runner__custom_python_want_json_module.yml b/tests/ansible/integration/runner__custom_python_want_json_module.yml similarity index 100% rename from examples/playbook/runner__custom_python_want_json_module.yml rename to tests/ansible/integration/runner__custom_python_want_json_module.yml diff --git a/examples/playbook/runner__remote_tmp.yml b/tests/ansible/integration/runner__remote_tmp.yml similarity index 100% rename from examples/playbook/runner__remote_tmp.yml rename to tests/ansible/integration/runner__remote_tmp.yml diff --git a/examples/playbook/modules/bash_return_paths.sh b/tests/ansible/modules/bash_return_paths.sh similarity index 100% rename from examples/playbook/modules/bash_return_paths.sh rename to tests/ansible/modules/bash_return_paths.sh diff --git a/examples/playbook/modules/custom_bash_old_style_module.sh b/tests/ansible/modules/custom_bash_old_style_module.sh similarity index 100% rename from examples/playbook/modules/custom_bash_old_style_module.sh rename to tests/ansible/modules/custom_bash_old_style_module.sh diff --git a/examples/playbook/modules/custom_bash_want_json_module.sh b/tests/ansible/modules/custom_bash_want_json_module.sh similarity index 100% rename from examples/playbook/modules/custom_bash_want_json_module.sh rename to tests/ansible/modules/custom_bash_want_json_module.sh diff --git a/examples/playbook/modules/custom_binary_producing_json.c b/tests/ansible/modules/custom_binary_producing_json.c similarity index 100% rename from examples/playbook/modules/custom_binary_producing_json.c rename to tests/ansible/modules/custom_binary_producing_json.c diff --git a/examples/playbook/modules/custom_binary_producing_junk.c b/tests/ansible/modules/custom_binary_producing_junk.c similarity index 100% rename from examples/playbook/modules/custom_binary_producing_junk.c rename to tests/ansible/modules/custom_binary_producing_junk.c diff --git a/examples/playbook/modules/custom_binary_single_null b/tests/ansible/modules/custom_binary_single_null similarity index 100% rename from examples/playbook/modules/custom_binary_single_null rename to tests/ansible/modules/custom_binary_single_null diff --git a/examples/playbook/modules/custom_perl_json_args_module.pl b/tests/ansible/modules/custom_perl_json_args_module.pl similarity index 100% rename from examples/playbook/modules/custom_perl_json_args_module.pl rename to tests/ansible/modules/custom_perl_json_args_module.pl diff --git a/examples/playbook/modules/custom_perl_want_json_module.pl b/tests/ansible/modules/custom_perl_want_json_module.pl similarity index 100% rename from examples/playbook/modules/custom_perl_want_json_module.pl rename to tests/ansible/modules/custom_perl_want_json_module.pl diff --git a/examples/playbook/modules/custom_python_json_args_module.py b/tests/ansible/modules/custom_python_json_args_module.py similarity index 100% rename from examples/playbook/modules/custom_python_json_args_module.py rename to tests/ansible/modules/custom_python_json_args_module.py diff --git a/examples/playbook/modules/custom_python_new_style_module.py b/tests/ansible/modules/custom_python_new_style_module.py similarity index 100% rename from examples/playbook/modules/custom_python_new_style_module.py rename to tests/ansible/modules/custom_python_new_style_module.py diff --git a/examples/playbook/modules/custom_python_want_json_module.py b/tests/ansible/modules/custom_python_want_json_module.py similarity index 100% rename from examples/playbook/modules/custom_python_want_json_module.py rename to tests/ansible/modules/custom_python_want_json_module.py diff --git a/examples/playbook/issue_109.yml b/tests/ansible/regression/issue_109.yml similarity index 100% rename from examples/playbook/issue_109.yml rename to tests/ansible/regression/issue_109.yml diff --git a/examples/playbook/issue_113.yml b/tests/ansible/regression/issue_113.yml similarity index 100% rename from examples/playbook/issue_113.yml rename to tests/ansible/regression/issue_113.yml diff --git a/examples/playbook/issue_118.yml b/tests/ansible/regression/issue_118.yml similarity index 100% rename from examples/playbook/issue_118.yml rename to tests/ansible/regression/issue_118.yml diff --git a/examples/playbook/issue_122.yml b/tests/ansible/regression/issue_122.yml similarity index 100% rename from examples/playbook/issue_122.yml rename to tests/ansible/regression/issue_122.yml diff --git a/examples/playbook/issue_131.yml b/tests/ansible/regression/issue_131.yml similarity index 100% rename from examples/playbook/issue_131.yml rename to tests/ansible/regression/issue_131.yml diff --git a/examples/playbook/issue_140.yml b/tests/ansible/regression/issue_140.yml similarity index 100% rename from examples/playbook/issue_140.yml rename to tests/ansible/regression/issue_140.yml diff --git a/examples/playbook/issue_152.yml b/tests/ansible/regression/issue_152.yml similarity index 100% rename from examples/playbook/issue_152.yml rename to tests/ansible/regression/issue_152.yml diff --git a/examples/playbook/issue_152b.yml b/tests/ansible/regression/issue_152b.yml similarity index 100% rename from examples/playbook/issue_152b.yml rename to tests/ansible/regression/issue_152b.yml diff --git a/examples/playbook/issue_154.yml b/tests/ansible/regression/issue_154.yml similarity index 100% rename from examples/playbook/issue_154.yml rename to tests/ansible/regression/issue_154.yml diff --git a/examples/playbook/issue_174.yml b/tests/ansible/regression/issue_174.yml similarity index 100% rename from examples/playbook/issue_174.yml rename to tests/ansible/regression/issue_174.yml diff --git a/examples/playbook/issue_177.yml b/tests/ansible/regression/issue_177.yml similarity index 100% rename from examples/playbook/issue_177.yml rename to tests/ansible/regression/issue_177.yml diff --git a/examples/playbook/roles/issue_109/tasks/main.yml b/tests/ansible/regression/roles/issue_109/tasks/main.yml similarity index 100% rename from examples/playbook/roles/issue_109/tasks/main.yml rename to tests/ansible/regression/roles/issue_109/tasks/main.yml diff --git a/examples/playbook/roles/issue_109_add_ssh_key/tasks/main.yml b/tests/ansible/regression/roles/issue_109_add_ssh_key/tasks/main.yml similarity index 100% rename from examples/playbook/roles/issue_109_add_ssh_key/tasks/main.yml rename to tests/ansible/regression/roles/issue_109_add_ssh_key/tasks/main.yml diff --git a/examples/playbook/roles/issue_109_gather_facts/tasks/main.yml b/tests/ansible/regression/roles/issue_109_gather_facts/tasks/main.yml similarity index 100% rename from examples/playbook/roles/issue_109_gather_facts/tasks/main.yml rename to tests/ansible/regression/roles/issue_109_gather_facts/tasks/main.yml diff --git a/examples/playbook/scripts/issue_118_saytrue b/tests/ansible/regression/scripts/issue_118_saytrue similarity index 100% rename from examples/playbook/scripts/issue_118_saytrue rename to tests/ansible/regression/scripts/issue_118_saytrue diff --git a/examples/playbook/scripts/print_env.sh b/tests/ansible/regression/scripts/print_env.sh similarity index 100% rename from examples/playbook/scripts/print_env.sh rename to tests/ansible/regression/scripts/print_env.sh