diff options
| author | Matt Clay <matt@mystile.com> | 2019-03-11 23:49:08 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2019-03-12 00:00:32 -0700 |
| commit | 1143889f26caab75b5ac47f9f9db519658a41ea3 (patch) | |
| tree | 2aebfb907d11fbdd3c264c48f1a6fb48851b655c /test/integration/targets/handlers | |
| parent | 759e037edcb2f4fc28718a72cc520d3cd572ddf8 (diff) | |
| download | ansible-1143889f26caab75b5ac47f9f9db519658a41ea3.tar.gz | |
Fix integration test inventory.
Diffstat (limited to 'test/integration/targets/handlers')
8 files changed, 4 insertions, 16 deletions
diff --git a/test/integration/targets/handlers/from_handlers.yml b/test/integration/targets/handlers/from_handlers.yml index d5a202c84e..7b2dea2d53 100644 --- a/test/integration/targets/handlers/from_handlers.yml +++ b/test/integration/targets/handlers/from_handlers.yml @@ -1,7 +1,6 @@ - name: verify handlers_from on include_role hosts: A gather_facts: False - connection: local tags: ['scenario1'] tasks: - name: test include_role @@ -21,7 +20,6 @@ - name: verify handlers_from on import_role hosts: A gather_facts: False - connection: local tasks: - name: set facts to false set_fact: diff --git a/test/integration/targets/handlers/inventory.handlers b/test/integration/targets/handlers/inventory.handlers index 905026f12e..268cf65748 100644 --- a/test/integration/targets/handlers/inventory.handlers +++ b/test/integration/targets/handlers/inventory.handlers @@ -4,3 +4,7 @@ B C D E + +[testgroup:vars] +ansible_connection=local +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/handlers/test_force_handlers.yml b/test/integration/targets/handlers/test_force_handlers.yml index f7cadbd86d..9cff772929 100644 --- a/test/integration/targets/handlers/test_force_handlers.yml +++ b/test/integration/targets/handlers/test_force_handlers.yml @@ -4,7 +4,6 @@ tags: normal hosts: testgroup gather_facts: False - connection: local roles: - { role: test_force_handlers } tasks: @@ -14,7 +13,6 @@ tags: force_true_in_play hosts: testgroup gather_facts: False - connection: local force_handlers: True roles: - { role: test_force_handlers, tags: force_true_in_play } @@ -24,7 +22,6 @@ tags: force_false_in_play hosts: testgroup gather_facts: False - connection: local force_handlers: False roles: - { role: test_force_handlers, tags: force_false_in_play } diff --git a/test/integration/targets/handlers/test_handlers.yml b/test/integration/targets/handlers/test_handlers.yml index 142eeb387d..ae9847bae1 100644 --- a/test/integration/targets/handlers/test_handlers.yml +++ b/test/integration/targets/handlers/test_handlers.yml @@ -2,14 +2,12 @@ - name: run handlers hosts: A gather_facts: False - connection: local roles: - { role: test_handlers_meta, tags: ['scenario1'] } - name: verify final handler was run hosts: A gather_facts: False - connection: local tasks: - name: verify handler2 ran assert: @@ -21,7 +19,6 @@ - name: verify listening handlers hosts: A gather_facts: False - connection: local tasks: - name: notify some handlers command: echo foo @@ -46,6 +43,5 @@ - name: test handlers hosts: testgroup gather_facts: False - connection: local roles: - { role: test_handlers } diff --git a/test/integration/targets/handlers/test_handlers_any_errors_fatal.yml b/test/integration/targets/handlers/test_handlers_any_errors_fatal.yml index 9029443a6f..6b791a3bbb 100644 --- a/test/integration/targets/handlers/test_handlers_any_errors_fatal.yml +++ b/test/integration/targets/handlers/test_handlers_any_errors_fatal.yml @@ -3,7 +3,6 @@ - B gather_facts: no any_errors_fatal: yes - connection: local vars: output_dir: /tmp tasks: diff --git a/test/integration/targets/handlers/test_handlers_inexistent_notify.yml b/test/integration/targets/handlers/test_handlers_inexistent_notify.yml index f1c99efe12..15de38aa35 100644 --- a/test/integration/targets/handlers/test_handlers_inexistent_notify.yml +++ b/test/integration/targets/handlers/test_handlers_inexistent_notify.yml @@ -2,7 +2,6 @@ - name: notify inexistent handler hosts: localhost gather_facts: false - connection: local tasks: - name: test notify an inexistent handler command: uptime diff --git a/test/integration/targets/handlers/test_handlers_listen.yml b/test/integration/targets/handlers/test_handlers_listen.yml index b892af3b15..5477968bed 100644 --- a/test/integration/targets/handlers/test_handlers_listen.yml +++ b/test/integration/targets/handlers/test_handlers_listen.yml @@ -2,7 +2,6 @@ - name: test listen with named handlers hosts: localhost gather_facts: false - connection: local tasks: - name: test notify handlers listen command: uptime @@ -27,7 +26,6 @@ - name: test listen unnamed handlers hosts: localhost gather_facts: false - connection: local pre_tasks: - name: notify some handlers command: echo foo @@ -51,7 +49,6 @@ - name: test with mixed notify by name and listen hosts: localhost gather_facts: false - connection: local tasks: - name: test notify handlers names and identical listen command: uptime @@ -91,7 +88,6 @@ - name: test listen in roles hosts: localhost gather_facts: false - connection: local roles: - role: test_handlers_listen tasks: diff --git a/test/integration/targets/handlers/test_listening_handlers.yml b/test/integration/targets/handlers/test_listening_handlers.yml index 6500f02cfb..67bdad9aa2 100644 --- a/test/integration/targets/handlers/test_listening_handlers.yml +++ b/test/integration/targets/handlers/test_listening_handlers.yml @@ -2,7 +2,6 @@ - name: verify listening handlers hosts: A gather_facts: False - connection: local tasks: - name: notify some handlers command: echo foo |