From 6ad18b67197e6b490e8896146fed53c3f387f255 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Thu, 19 Apr 2018 22:12:18 +0100 Subject: [PATCH] issue #191: move async tests to their own category --- tests/ansible/integration/all.yml | 1 + tests/ansible/integration/async/all.yml | 3 +++ .../async_job_timeout.yml => async/runner_job_timeout.yml} | 2 +- .../{runner/async_one_job.yml => async/runner_one_job.yml} | 2 +- .../runner_two_simultaneous_jobs.yml} | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tests/ansible/integration/async/all.yml rename tests/ansible/integration/{runner/async_job_timeout.yml => async/runner_job_timeout.yml} (96%) rename tests/ansible/integration/{runner/async_one_job.yml => async/runner_one_job.yml} (98%) rename tests/ansible/integration/{runner/async_two_simultaneous_jobs.yml => async/runner_two_simultaneous_jobs.yml} (95%) diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 4dd2c596..15471c75 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -4,6 +4,7 @@ # - import_playbook: action/all.yml +- import_playbook: async/all.yml - import_playbook: become/all.yml - import_playbook: connection_loader/all.yml - import_playbook: context_service/all.yml diff --git a/tests/ansible/integration/async/all.yml b/tests/ansible/integration/async/all.yml new file mode 100644 index 00000000..0a7364f2 --- /dev/null +++ b/tests/ansible/integration/async/all.yml @@ -0,0 +1,3 @@ +- import_playbook: runner_job_timeout.yml +- import_playbook: runner_one_job.yml +- import_playbook: runner_two_simultaneous_jobs.yml diff --git a/tests/ansible/integration/runner/async_job_timeout.yml b/tests/ansible/integration/async/runner_job_timeout.yml similarity index 96% rename from tests/ansible/integration/runner/async_job_timeout.yml rename to tests/ansible/integration/async/runner_job_timeout.yml index 868b676d..b15fc2dd 100644 --- a/tests/ansible/integration/runner/async_job_timeout.yml +++ b/tests/ansible/integration/async/runner_job_timeout.yml @@ -1,6 +1,6 @@ # Verify 'async: ' functions as desired. -- name: integration/runner/async_job_timeout.yml +- name: integration/async/runner_job_timeout.yml hosts: all any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/async_one_job.yml b/tests/ansible/integration/async/runner_one_job.yml similarity index 98% rename from tests/ansible/integration/runner/async_one_job.yml rename to tests/ansible/integration/async/runner_one_job.yml index 6933f82b..846b173c 100644 --- a/tests/ansible/integration/runner/async_one_job.yml +++ b/tests/ansible/integration/async/runner_one_job.yml @@ -1,7 +1,7 @@ # Verify behaviour of a single asynchronous task, and presence of all output # fields. -- name: integration/runner/async_one_job.yml +- name: integration/async/runner_one_job.yml hosts: all any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/async_two_simultaneous_jobs.yml b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml similarity index 95% rename from tests/ansible/integration/runner/async_two_simultaneous_jobs.yml rename to tests/ansible/integration/async/runner_two_simultaneous_jobs.yml index 679608c5..5c20fc5d 100644 --- a/tests/ansible/integration/runner/async_two_simultaneous_jobs.yml +++ b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml @@ -1,5 +1,5 @@ -- name: integration/runner/async_two_simultaneous_jobs.yml +- name: integration/async/runner_two_simultaneous_jobs.yml hosts: all any_errors_fatal: true tasks: