diff --git a/test/README.md b/test/README.md deleted file mode 100644 index 8da8aeb7276..00000000000 --- a/test/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Legacy tests -============ - -These tests are active but are being refactored. - -See 'new_tests' directory for what will soon replace them. - diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 00000000000..e5339acc625 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,28 @@ +Ansible Test System +=================== + +Folders + +unit +---- + +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. + +Playbook engine code is better suited for integration tests. + +integration +----------- + +Integration test layer, constructed using playbooks. + +Some tests may require cloud credentials, others will not, and destructive tests are seperated from non-destructive so a subset +can be run on development machines. + +learn more +---------- + +hop into a subdirectory and see the associated README.md for more info. + + + diff --git a/tests_new/integration/Makefile b/tests/integration/Makefile similarity index 100% rename from tests_new/integration/Makefile rename to tests/integration/Makefile diff --git a/tests_new/integration/README.md b/tests/integration/README.md similarity index 100% rename from tests_new/integration/README.md rename to tests/integration/README.md diff --git a/tests_new/integration/all.yml b/tests/integration/all.yml similarity index 100% rename from tests_new/integration/all.yml rename to tests/integration/all.yml diff --git a/tests_new/integration/amazon.yml b/tests/integration/amazon.yml similarity index 100% rename from tests_new/integration/amazon.yml rename to tests/integration/amazon.yml diff --git a/tests_new/integration/check_mode.yml b/tests/integration/check_mode.yml similarity index 100% rename from tests_new/integration/check_mode.yml rename to tests/integration/check_mode.yml diff --git a/tests_new/integration/destructive.yml b/tests/integration/destructive.yml similarity index 100% rename from tests_new/integration/destructive.yml rename to tests/integration/destructive.yml diff --git a/tests_new/integration/group_vars/all b/tests/integration/group_vars/all similarity index 100% rename from tests_new/integration/group_vars/all rename to tests/integration/group_vars/all diff --git a/tests_new/integration/group_vars/local b/tests/integration/group_vars/local similarity index 100% rename from tests_new/integration/group_vars/local rename to tests/integration/group_vars/local diff --git a/tests_new/integration/host_vars/testhost b/tests/integration/host_vars/testhost similarity index 100% rename from tests_new/integration/host_vars/testhost rename to tests/integration/host_vars/testhost diff --git a/tests_new/integration/integration_config.yml b/tests/integration/integration_config.yml similarity index 100% rename from tests_new/integration/integration_config.yml rename to tests/integration/integration_config.yml diff --git a/tests_new/integration/inventory b/tests/integration/inventory similarity index 100% rename from tests_new/integration/inventory rename to tests/integration/inventory diff --git a/tests_new/integration/non_destructive.yml b/tests/integration/non_destructive.yml similarity index 100% rename from tests_new/integration/non_destructive.yml rename to tests/integration/non_destructive.yml diff --git a/tests_new/integration/rackspace.yml b/tests/integration/rackspace.yml similarity index 100% rename from tests_new/integration/rackspace.yml rename to tests/integration/rackspace.yml diff --git a/tests_new/integration/roles/prepare_tests/tasks/main.yml b/tests/integration/roles/prepare_tests/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/prepare_tests/tasks/main.yml rename to tests/integration/roles/prepare_tests/tasks/main.yml diff --git a/tests_new/integration/roles/test_always_run/meta/main.yml b/tests/integration/roles/test_always_run/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_always_run/meta/main.yml rename to tests/integration/roles/test_always_run/meta/main.yml diff --git a/tests_new/integration/roles/test_always_run/tasks/main.yml b/tests/integration/roles/test_always_run/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_always_run/tasks/main.yml rename to tests/integration/roles/test_always_run/tasks/main.yml diff --git a/tests_new/integration/roles/test_apt/meta/main.yml b/tests/integration/roles/test_apt/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_apt/meta/main.yml rename to tests/integration/roles/test_apt/meta/main.yml diff --git a/tests_new/integration/roles/test_apt/tasks/apt.yml b/tests/integration/roles/test_apt/tasks/apt.yml similarity index 100% rename from tests_new/integration/roles/test_apt/tasks/apt.yml rename to tests/integration/roles/test_apt/tasks/apt.yml diff --git a/tests_new/integration/roles/test_apt/tasks/main.yml b/tests/integration/roles/test_apt/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_apt/tasks/main.yml rename to tests/integration/roles/test_apt/tasks/main.yml diff --git a/tests_new/integration/roles/test_changed_when/meta/main.yml b/tests/integration/roles/test_changed_when/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_changed_when/meta/main.yml rename to tests/integration/roles/test_changed_when/meta/main.yml diff --git a/tests_new/integration/roles/test_changed_when/tasks/main.yml b/tests/integration/roles/test_changed_when/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_changed_when/tasks/main.yml rename to tests/integration/roles/test_changed_when/tasks/main.yml diff --git a/tests_new/integration/roles/test_command_shell/files/test.sh b/tests/integration/roles/test_command_shell/files/test.sh similarity index 100% rename from tests_new/integration/roles/test_command_shell/files/test.sh rename to tests/integration/roles/test_command_shell/files/test.sh diff --git a/tests_new/integration/roles/test_conditionals/tasks/main.yml b/tests/integration/roles/test_conditionals/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_conditionals/tasks/main.yml rename to tests/integration/roles/test_conditionals/tasks/main.yml diff --git a/tests_new/integration/roles/test_copy/files/foo.txt b/tests/integration/roles/test_copy/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_copy/files/foo.txt rename to tests/integration/roles/test_copy/files/foo.txt diff --git a/tests_new/integration/roles/test_copy/files/subdir/bar.txt b/tests/integration/roles/test_copy/files/subdir/bar.txt similarity index 100% rename from tests_new/integration/roles/test_copy/files/subdir/bar.txt rename to tests/integration/roles/test_copy/files/subdir/bar.txt diff --git a/tests_new/integration/roles/test_copy/files/subdir/subdir2/baz.txt b/tests/integration/roles/test_copy/files/subdir/subdir2/baz.txt similarity index 100% rename from tests_new/integration/roles/test_copy/files/subdir/subdir2/baz.txt rename to tests/integration/roles/test_copy/files/subdir/subdir2/baz.txt diff --git a/tests_new/integration/roles/test_copy/meta/main.yml b/tests/integration/roles/test_copy/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_copy/meta/main.yml rename to tests/integration/roles/test_copy/meta/main.yml diff --git a/tests_new/integration/roles/test_copy/tasks/main.yml b/tests/integration/roles/test_copy/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_copy/tasks/main.yml rename to tests/integration/roles/test_copy/tasks/main.yml diff --git a/tests_new/integration/roles/test_facts_d/meta/main.yml b/tests/integration/roles/test_facts_d/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_facts_d/meta/main.yml rename to tests/integration/roles/test_facts_d/meta/main.yml diff --git a/tests_new/integration/roles/test_facts_d/tasks/main.yml b/tests/integration/roles/test_facts_d/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_facts_d/tasks/main.yml rename to tests/integration/roles/test_facts_d/tasks/main.yml diff --git a/tests_new/integration/roles/test_fetch/meta/main.yml b/tests/integration/roles/test_fetch/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_fetch/meta/main.yml rename to tests/integration/roles/test_fetch/meta/main.yml diff --git a/tests_new/integration/roles/test_fetch/tasks/main.yml b/tests/integration/roles/test_fetch/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_fetch/tasks/main.yml rename to tests/integration/roles/test_fetch/tasks/main.yml diff --git a/tests_new/integration/roles/test_file/files/foo.txt b/tests/integration/roles/test_file/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_file/files/foo.txt rename to tests/integration/roles/test_file/files/foo.txt diff --git a/tests_new/integration/roles/test_file/files/foobar/directory/fileC b/tests/integration/roles/test_file/files/foobar/directory/fileC similarity index 100% rename from tests_new/integration/roles/test_file/files/foobar/directory/fileC rename to tests/integration/roles/test_file/files/foobar/directory/fileC diff --git a/tests_new/integration/roles/test_file/files/foobar/directory/fileD b/tests/integration/roles/test_file/files/foobar/directory/fileD similarity index 100% rename from tests_new/integration/roles/test_file/files/foobar/directory/fileD rename to tests/integration/roles/test_file/files/foobar/directory/fileD diff --git a/tests_new/integration/roles/test_file/files/foobar/fileA b/tests/integration/roles/test_file/files/foobar/fileA similarity index 100% rename from tests_new/integration/roles/test_file/files/foobar/fileA rename to tests/integration/roles/test_file/files/foobar/fileA diff --git a/tests_new/integration/roles/test_file/files/foobar/fileB b/tests/integration/roles/test_file/files/foobar/fileB similarity index 100% rename from tests_new/integration/roles/test_file/files/foobar/fileB rename to tests/integration/roles/test_file/files/foobar/fileB diff --git a/tests_new/integration/roles/test_file/meta/main.yml b/tests/integration/roles/test_file/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_file/meta/main.yml rename to tests/integration/roles/test_file/meta/main.yml diff --git a/tests_new/integration/roles/test_file/tasks/main.yml b/tests/integration/roles/test_file/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_file/tasks/main.yml rename to tests/integration/roles/test_file/tasks/main.yml diff --git a/tests_new/integration/roles/test_file/tasks/selinux_tests.yml b/tests/integration/roles/test_file/tasks/selinux_tests.yml similarity index 100% rename from tests_new/integration/roles/test_file/tasks/selinux_tests.yml rename to tests/integration/roles/test_file/tasks/selinux_tests.yml diff --git a/tests_new/integration/roles/test_filters/files/foo.txt b/tests/integration/roles/test_filters/files/foo.txt similarity index 97% rename from tests_new/integration/roles/test_filters/files/foo.txt rename to tests/integration/roles/test_filters/files/foo.txt index aa9aea76868..5ee5a5812c8 100644 --- a/tests_new/integration/roles/test_filters/files/foo.txt +++ b/tests/integration/roles/test_filters/files/foo.txt @@ -60,7 +60,6 @@ fileglob = [] There are also various string operations that work on paths. These do not require files to exist and are passthrus to the python os.path functions -'~/foo' with expanduser = /root/foo /etc/motd with basename = motd /etc/motd with dirname = /etc diff --git a/tests_new/integration/roles/test_filters/meta/main.yml b/tests/integration/roles/test_filters/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_filters/meta/main.yml rename to tests/integration/roles/test_filters/meta/main.yml diff --git a/tests_new/integration/roles/test_filters/tasks/main.yml b/tests/integration/roles/test_filters/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_filters/tasks/main.yml rename to tests/integration/roles/test_filters/tasks/main.yml diff --git a/tests_new/integration/roles/test_filters/templates/foo.j2 b/tests/integration/roles/test_filters/templates/foo.j2 similarity index 96% rename from tests_new/integration/roles/test_filters/templates/foo.j2 rename to tests/integration/roles/test_filters/templates/foo.j2 index d1b2f163e5f..6d1dde20c22 100644 --- a/tests_new/integration/roles/test_filters/templates/foo.j2 +++ b/tests/integration/roles/test_filters/templates/foo.j2 @@ -47,7 +47,6 @@ fileglob = {{ (output_dir + '/*') | fileglob }} There are also various string operations that work on paths. These do not require files to exist and are passthrus to the python os.path functions -'~/foo' with expanduser = {{ '~/foo' | expanduser }} /etc/motd with basename = {{ '/etc/motd' | basename }} /etc/motd with dirname = {{ '/etc/motd' | dirname }} diff --git a/tests_new/integration/roles/test_filters/vars/main.yml b/tests/integration/roles/test_filters/vars/main.yml similarity index 100% rename from tests_new/integration/roles/test_filters/vars/main.yml rename to tests/integration/roles/test_filters/vars/main.yml diff --git a/tests_new/integration/roles/test_gem/meta/main.yml b/tests/integration/roles/test_gem/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_gem/meta/main.yml rename to tests/integration/roles/test_gem/meta/main.yml diff --git a/tests_new/integration/roles/test_gem/tasks/main.yml b/tests/integration/roles/test_gem/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_gem/tasks/main.yml rename to tests/integration/roles/test_gem/tasks/main.yml diff --git a/tests_new/integration/roles/test_git/meta/main.yml b/tests/integration/roles/test_git/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_git/meta/main.yml rename to tests/integration/roles/test_git/meta/main.yml diff --git a/tests_new/integration/roles/test_git/tasks/main.yml b/tests/integration/roles/test_git/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_git/tasks/main.yml rename to tests/integration/roles/test_git/tasks/main.yml diff --git a/tests_new/integration/roles/test_hash_behavior/defaults/main.yml b/tests/integration/roles/test_hash_behavior/defaults/main.yml similarity index 100% rename from tests_new/integration/roles/test_hash_behavior/defaults/main.yml rename to tests/integration/roles/test_hash_behavior/defaults/main.yml diff --git a/tests_new/integration/roles/test_hash_behavior/meta/main.yml b/tests/integration/roles/test_hash_behavior/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_hash_behavior/meta/main.yml rename to tests/integration/roles/test_hash_behavior/meta/main.yml diff --git a/tests_new/integration/roles/test_hash_behavior/tasks/main.yml b/tests/integration/roles/test_hash_behavior/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_hash_behavior/tasks/main.yml rename to tests/integration/roles/test_hash_behavior/tasks/main.yml diff --git a/tests_new/integration/roles/test_hash_behavior/vars/main.yml b/tests/integration/roles/test_hash_behavior/vars/main.yml similarity index 100% rename from tests_new/integration/roles/test_hash_behavior/vars/main.yml rename to tests/integration/roles/test_hash_behavior/vars/main.yml diff --git a/tests_new/integration/roles/test_hg/meta/main.yml b/tests/integration/roles/test_hg/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_hg/meta/main.yml rename to tests/integration/roles/test_hg/meta/main.yml diff --git a/tests_new/integration/roles/test_hg/tasks/main.yml b/tests/integration/roles/test_hg/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_hg/tasks/main.yml rename to tests/integration/roles/test_hg/tasks/main.yml diff --git a/tests_new/integration/roles/test_ignore_errors/meta/main.yml b/tests/integration/roles/test_ignore_errors/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_ignore_errors/meta/main.yml rename to tests/integration/roles/test_ignore_errors/meta/main.yml diff --git a/tests_new/integration/roles/test_ignore_errors/tasks/main.yml b/tests/integration/roles/test_ignore_errors/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_ignore_errors/tasks/main.yml rename to tests/integration/roles/test_ignore_errors/tasks/main.yml diff --git a/tests_new/integration/roles/test_lineinfile/files/test.txt b/tests/integration/roles/test_lineinfile/files/test.txt similarity index 100% rename from tests_new/integration/roles/test_lineinfile/files/test.txt rename to tests/integration/roles/test_lineinfile/files/test.txt diff --git a/tests_new/integration/roles/test_lineinfile/meta/main.yml b/tests/integration/roles/test_lineinfile/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_lineinfile/meta/main.yml rename to tests/integration/roles/test_lineinfile/meta/main.yml diff --git a/tests_new/integration/roles/test_lineinfile/tasks/main.yml b/tests/integration/roles/test_lineinfile/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_lineinfile/tasks/main.yml rename to tests/integration/roles/test_lineinfile/tasks/main.yml diff --git a/tests_new/integration/roles/test_ping/tasks/main.yml b/tests/integration/roles/test_ping/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_ping/tasks/main.yml rename to tests/integration/roles/test_ping/tasks/main.yml diff --git a/tests_new/integration/roles/test_pip/meta/main.yml b/tests/integration/roles/test_pip/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_pip/meta/main.yml rename to tests/integration/roles/test_pip/meta/main.yml diff --git a/tests_new/integration/roles/test_pip/tasks/main.yml b/tests/integration/roles/test_pip/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_pip/tasks/main.yml rename to tests/integration/roles/test_pip/tasks/main.yml diff --git a/tests_new/integration/roles/test_service/files/ansible.systemd b/tests/integration/roles/test_service/files/ansible.systemd similarity index 100% rename from tests_new/integration/roles/test_service/files/ansible.systemd rename to tests/integration/roles/test_service/files/ansible.systemd diff --git a/tests_new/integration/roles/test_service/files/ansible.sysv b/tests/integration/roles/test_service/files/ansible.sysv similarity index 100% rename from tests_new/integration/roles/test_service/files/ansible.sysv rename to tests/integration/roles/test_service/files/ansible.sysv diff --git a/tests_new/integration/roles/test_service/files/ansible.upstart b/tests/integration/roles/test_service/files/ansible.upstart similarity index 100% rename from tests_new/integration/roles/test_service/files/ansible.upstart rename to tests/integration/roles/test_service/files/ansible.upstart diff --git a/tests_new/integration/roles/test_service/files/ansible_test_service b/tests/integration/roles/test_service/files/ansible_test_service similarity index 100% rename from tests_new/integration/roles/test_service/files/ansible_test_service rename to tests/integration/roles/test_service/files/ansible_test_service diff --git a/tests_new/integration/roles/test_service/meta/main.yml b/tests/integration/roles/test_service/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_service/meta/main.yml rename to tests/integration/roles/test_service/meta/main.yml diff --git a/tests_new/integration/roles/test_service/tasks/main.yml b/tests/integration/roles/test_service/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/main.yml rename to tests/integration/roles/test_service/tasks/main.yml diff --git a/tests_new/integration/roles/test_service/tasks/systemd_cleanup.yml b/tests/integration/roles/test_service/tasks/systemd_cleanup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/systemd_cleanup.yml rename to tests/integration/roles/test_service/tasks/systemd_cleanup.yml diff --git a/tests_new/integration/roles/test_service/tasks/systemd_setup.yml b/tests/integration/roles/test_service/tasks/systemd_setup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/systemd_setup.yml rename to tests/integration/roles/test_service/tasks/systemd_setup.yml diff --git a/tests_new/integration/roles/test_service/tasks/sysv_cleanup.yml b/tests/integration/roles/test_service/tasks/sysv_cleanup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/sysv_cleanup.yml rename to tests/integration/roles/test_service/tasks/sysv_cleanup.yml diff --git a/tests_new/integration/roles/test_service/tasks/sysv_setup.yml b/tests/integration/roles/test_service/tasks/sysv_setup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/sysv_setup.yml rename to tests/integration/roles/test_service/tasks/sysv_setup.yml diff --git a/tests_new/integration/roles/test_service/tasks/upstart_cleanup.yml b/tests/integration/roles/test_service/tasks/upstart_cleanup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/upstart_cleanup.yml rename to tests/integration/roles/test_service/tasks/upstart_cleanup.yml diff --git a/tests_new/integration/roles/test_service/tasks/upstart_setup.yml b/tests/integration/roles/test_service/tasks/upstart_setup.yml similarity index 100% rename from tests_new/integration/roles/test_service/tasks/upstart_setup.yml rename to tests/integration/roles/test_service/tasks/upstart_setup.yml diff --git a/tests_new/integration/roles/test_service/templates/main.yml b/tests/integration/roles/test_service/templates/main.yml similarity index 100% rename from tests_new/integration/roles/test_service/templates/main.yml rename to tests/integration/roles/test_service/templates/main.yml diff --git a/tests_new/integration/roles/test_stat/files/foo.txt b/tests/integration/roles/test_stat/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_stat/files/foo.txt rename to tests/integration/roles/test_stat/files/foo.txt diff --git a/tests_new/integration/roles/test_stat/meta/main.yml b/tests/integration/roles/test_stat/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_stat/meta/main.yml rename to tests/integration/roles/test_stat/meta/main.yml diff --git a/tests_new/integration/roles/test_stat/tasks/main.yml b/tests/integration/roles/test_stat/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_stat/tasks/main.yml rename to tests/integration/roles/test_stat/tasks/main.yml diff --git a/tests_new/integration/roles/test_subversion/meta/main.yml b/tests/integration/roles/test_subversion/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_subversion/meta/main.yml rename to tests/integration/roles/test_subversion/meta/main.yml diff --git a/tests_new/integration/roles/test_subversion/tasks/main.yml b/tests/integration/roles/test_subversion/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_subversion/tasks/main.yml rename to tests/integration/roles/test_subversion/tasks/main.yml diff --git a/tests_new/integration/roles/test_synchronize/files/foo.txt b/tests/integration/roles/test_synchronize/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_synchronize/files/foo.txt rename to tests/integration/roles/test_synchronize/files/foo.txt diff --git a/tests_new/integration/roles/test_synchronize/meta/main.yml b/tests/integration/roles/test_synchronize/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_synchronize/meta/main.yml rename to tests/integration/roles/test_synchronize/meta/main.yml diff --git a/tests_new/integration/roles/test_synchronize/tasks/main.yml b/tests/integration/roles/test_synchronize/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_synchronize/tasks/main.yml rename to tests/integration/roles/test_synchronize/tasks/main.yml diff --git a/tests_new/integration/roles/test_template/files/foo.txt b/tests/integration/roles/test_template/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_template/files/foo.txt rename to tests/integration/roles/test_template/files/foo.txt diff --git a/tests_new/integration/roles/test_template/meta/main.yml b/tests/integration/roles/test_template/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_template/meta/main.yml rename to tests/integration/roles/test_template/meta/main.yml diff --git a/tests_new/integration/roles/test_template/tasks/main.yml b/tests/integration/roles/test_template/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_template/tasks/main.yml rename to tests/integration/roles/test_template/tasks/main.yml diff --git a/tests_new/integration/roles/test_template/templates/foo.j2 b/tests/integration/roles/test_template/templates/foo.j2 similarity index 100% rename from tests_new/integration/roles/test_template/templates/foo.j2 rename to tests/integration/roles/test_template/templates/foo.j2 diff --git a/tests_new/integration/roles/test_template/vars/main.yml b/tests/integration/roles/test_template/vars/main.yml similarity index 100% rename from tests_new/integration/roles/test_template/vars/main.yml rename to tests/integration/roles/test_template/vars/main.yml diff --git a/tests_new/integration/roles/test_unarchive/files/foo.txt b/tests/integration/roles/test_unarchive/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_unarchive/files/foo.txt rename to tests/integration/roles/test_unarchive/files/foo.txt diff --git a/tests_new/integration/roles/test_unarchive/meta/main.yml b/tests/integration/roles/test_unarchive/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_unarchive/meta/main.yml rename to tests/integration/roles/test_unarchive/meta/main.yml diff --git a/tests_new/integration/roles/test_unarchive/tasks/main.yml b/tests/integration/roles/test_unarchive/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_unarchive/tasks/main.yml rename to tests/integration/roles/test_unarchive/tasks/main.yml diff --git a/tests_new/integration/roles/test_var_blending/defaults/main.yml b/tests/integration/roles/test_var_blending/defaults/main.yml similarity index 100% rename from tests_new/integration/roles/test_var_blending/defaults/main.yml rename to tests/integration/roles/test_var_blending/defaults/main.yml diff --git a/tests_new/integration/roles/test_var_blending/files/foo.txt b/tests/integration/roles/test_var_blending/files/foo.txt similarity index 100% rename from tests_new/integration/roles/test_var_blending/files/foo.txt rename to tests/integration/roles/test_var_blending/files/foo.txt diff --git a/tests_new/integration/roles/test_var_blending/meta/main.yml b/tests/integration/roles/test_var_blending/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_var_blending/meta/main.yml rename to tests/integration/roles/test_var_blending/meta/main.yml diff --git a/tests_new/integration/roles/test_var_blending/tasks/main.yml b/tests/integration/roles/test_var_blending/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_var_blending/tasks/main.yml rename to tests/integration/roles/test_var_blending/tasks/main.yml diff --git a/tests_new/integration/roles/test_var_blending/templates/foo.j2 b/tests/integration/roles/test_var_blending/templates/foo.j2 similarity index 100% rename from tests_new/integration/roles/test_var_blending/templates/foo.j2 rename to tests/integration/roles/test_var_blending/templates/foo.j2 diff --git a/tests_new/integration/roles/test_var_blending/vars/main.yml b/tests/integration/roles/test_var_blending/vars/main.yml similarity index 100% rename from tests_new/integration/roles/test_var_blending/vars/main.yml rename to tests/integration/roles/test_var_blending/vars/main.yml diff --git a/tests_new/integration/roles/test_var_blending/vars/more_vars.yml b/tests/integration/roles/test_var_blending/vars/more_vars.yml similarity index 100% rename from tests_new/integration/roles/test_var_blending/vars/more_vars.yml rename to tests/integration/roles/test_var_blending/vars/more_vars.yml diff --git a/tests_new/integration/roles/test_yum/meta/main.yml b/tests/integration/roles/test_yum/meta/main.yml similarity index 100% rename from tests_new/integration/roles/test_yum/meta/main.yml rename to tests/integration/roles/test_yum/meta/main.yml diff --git a/tests_new/integration/roles/test_yum/tasks/main.yml b/tests/integration/roles/test_yum/tasks/main.yml similarity index 100% rename from tests_new/integration/roles/test_yum/tasks/main.yml rename to tests/integration/roles/test_yum/tasks/main.yml diff --git a/tests_new/integration/roles/test_yum/tasks/yum.yml b/tests/integration/roles/test_yum/tasks/yum.yml similarity index 100% rename from tests_new/integration/roles/test_yum/tasks/yum.yml rename to tests/integration/roles/test_yum/tasks/yum.yml diff --git a/tests_new/integration/test_hash.yml b/tests/integration/test_hash.yml similarity index 100% rename from tests_new/integration/test_hash.yml rename to tests/integration/test_hash.yml diff --git a/tests_new/integration/test_setup.yml b/tests/integration/test_setup.yml similarity index 100% rename from tests_new/integration/test_setup.yml rename to tests/integration/test_setup.yml diff --git a/tests_new/integration/vars/test_hash_vars.yml b/tests/integration/vars/test_hash_vars.yml similarity index 100% rename from tests_new/integration/vars/test_hash_vars.yml rename to tests/integration/vars/test_hash_vars.yml diff --git a/tests_new/integration/vars_file.yml b/tests/integration/vars_file.yml similarity index 100% rename from tests_new/integration/vars_file.yml rename to tests/integration/vars_file.yml diff --git a/tests_new/units/README.md b/tests/units/README.md similarity index 100% rename from tests_new/units/README.md rename to tests/units/README.md diff --git a/test/TestConstants.py b/tests/units/TestConstants.py similarity index 100% rename from test/TestConstants.py rename to tests/units/TestConstants.py diff --git a/test/TestFilters.py b/tests/units/TestFilters.py similarity index 100% rename from test/TestFilters.py rename to tests/units/TestFilters.py diff --git a/test/TestInventory.py b/tests/units/TestInventory.py similarity index 100% rename from test/TestInventory.py rename to tests/units/TestInventory.py diff --git a/test/TestSynchronize.py b/tests/units/TestSynchronize.py similarity index 100% rename from test/TestSynchronize.py rename to tests/units/TestSynchronize.py diff --git a/test/TestUtils.py b/tests/units/TestUtils.py similarity index 100% rename from test/TestUtils.py rename to tests/units/TestUtils.py diff --git a/test/ansible.cfg b/tests/units/ansible.cfg similarity index 100% rename from test/ansible.cfg rename to tests/units/ansible.cfg diff --git a/test/inventory_test_data/ansible_hosts b/tests/units/inventory_test_data/ansible_hosts similarity index 100% rename from test/inventory_test_data/ansible_hosts rename to tests/units/inventory_test_data/ansible_hosts diff --git a/test/inventory_test_data/common_vars.yml b/tests/units/inventory_test_data/common_vars.yml similarity index 100% rename from test/inventory_test_data/common_vars.yml rename to tests/units/inventory_test_data/common_vars.yml diff --git a/test/inventory_test_data/complex_hosts b/tests/units/inventory_test_data/complex_hosts similarity index 100% rename from test/inventory_test_data/complex_hosts rename to tests/units/inventory_test_data/complex_hosts diff --git a/test/inventory_test_data/hosts_list.yml b/tests/units/inventory_test_data/hosts_list.yml similarity index 100% rename from test/inventory_test_data/hosts_list.yml rename to tests/units/inventory_test_data/hosts_list.yml diff --git a/test/inventory_test_data/inventory/test_alpha_end_before_beg b/tests/units/inventory_test_data/inventory/test_alpha_end_before_beg similarity index 100% rename from test/inventory_test_data/inventory/test_alpha_end_before_beg rename to tests/units/inventory_test_data/inventory/test_alpha_end_before_beg diff --git a/test/inventory_test_data/inventory/test_combined_range b/tests/units/inventory_test_data/inventory/test_combined_range similarity index 100% rename from test/inventory_test_data/inventory/test_combined_range rename to tests/units/inventory_test_data/inventory/test_combined_range diff --git a/test/inventory_test_data/inventory/test_incorrect_format b/tests/units/inventory_test_data/inventory/test_incorrect_format similarity index 100% rename from test/inventory_test_data/inventory/test_incorrect_format rename to tests/units/inventory_test_data/inventory/test_incorrect_format diff --git a/test/inventory_test_data/inventory/test_incorrect_range b/tests/units/inventory_test_data/inventory/test_incorrect_range similarity index 100% rename from test/inventory_test_data/inventory/test_incorrect_range rename to tests/units/inventory_test_data/inventory/test_incorrect_range diff --git a/test/inventory_test_data/inventory/test_leading_range b/tests/units/inventory_test_data/inventory/test_leading_range similarity index 100% rename from test/inventory_test_data/inventory/test_leading_range rename to tests/units/inventory_test_data/inventory/test_leading_range diff --git a/test/inventory_test_data/inventory/test_missing_end b/tests/units/inventory_test_data/inventory/test_missing_end similarity index 100% rename from test/inventory_test_data/inventory/test_missing_end rename to tests/units/inventory_test_data/inventory/test_missing_end diff --git a/test/inventory_test_data/inventory_api.py b/tests/units/inventory_test_data/inventory_api.py similarity index 100% rename from test/inventory_test_data/inventory_api.py rename to tests/units/inventory_test_data/inventory_api.py diff --git a/test/inventory_test_data/inventory_dir/0hosts b/tests/units/inventory_test_data/inventory_dir/0hosts similarity index 100% rename from test/inventory_test_data/inventory_dir/0hosts rename to tests/units/inventory_test_data/inventory_dir/0hosts diff --git a/test/inventory_test_data/inventory_dir/1mythology b/tests/units/inventory_test_data/inventory_dir/1mythology similarity index 100% rename from test/inventory_test_data/inventory_dir/1mythology rename to tests/units/inventory_test_data/inventory_dir/1mythology diff --git a/test/inventory_test_data/inventory_dir/2levels b/tests/units/inventory_test_data/inventory_dir/2levels similarity index 100% rename from test/inventory_test_data/inventory_dir/2levels rename to tests/units/inventory_test_data/inventory_dir/2levels diff --git a/test/inventory_test_data/inventory_dir/3comments b/tests/units/inventory_test_data/inventory_dir/3comments similarity index 100% rename from test/inventory_test_data/inventory_dir/3comments rename to tests/units/inventory_test_data/inventory_dir/3comments diff --git a/test/inventory_test_data/large_range b/tests/units/inventory_test_data/large_range similarity index 100% rename from test/inventory_test_data/large_range rename to tests/units/inventory_test_data/large_range diff --git a/test/inventory_test_data/restrict_pattern b/tests/units/inventory_test_data/restrict_pattern similarity index 100% rename from test/inventory_test_data/restrict_pattern rename to tests/units/inventory_test_data/restrict_pattern diff --git a/test/inventory_test_data/simple_hosts b/tests/units/inventory_test_data/simple_hosts similarity index 100% rename from test/inventory_test_data/simple_hosts rename to tests/units/inventory_test_data/simple_hosts diff --git a/tests_new/README.md b/tests_new/README.md deleted file mode 100644 index 09726894831..00000000000 --- a/tests_new/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Ansible Test System -=================== - -Folders - -unit ----- - -New and approved unit tests, that test small pieces of code not suited for the integration test layer - -Not yet ready for pull requests. Opening this up soon. - -integration ------------ - -New integration test layer, constructed using playbooks. - -Not yet ready for pull requests. Opening this up soon. - -Some tests may require cloud credentials, others will not, and destructive tests will be seperated from non-destructive so a subset -can be run on development machines. -