From d7e55db99b331be30301b9d1f027be63504007be Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Sat, 22 May 2021 23:51:36 +1200 Subject: [PATCH] Massive adjustment in integration tests for changed and failed (#2577) * Replaced ".changed ==" with "is [not] changed". Same for failed * Mr Quote refused to go --- .../targets/archive/tasks/main.yml | 16 ++++++------- .../targets/flatpak/tasks/check_mode.yml | 24 +++++++++---------- .../targets/flatpak/tasks/main.yml | 4 ++-- .../targets/flatpak/tasks/test.yml | 16 ++++++------- .../flatpak_remote/tasks/check_mode.yml | 12 +++++----- .../targets/flatpak_remote/tasks/main.yml | 4 ++-- .../targets/flatpak_remote/tasks/test.yml | 10 ++++---- .../git_config/tasks/get_set_no_state.yml | 4 ++-- .../tasks/get_set_state_present.yml | 4 ++-- .../precedence_between_unset_and_value.yml | 2 +- .../git_config/tasks/unset_check_mode.yml | 2 +- .../git_config/tasks/unset_no_value.yml | 2 +- .../targets/git_config/tasks/unset_value.yml | 2 +- .../targets/github_issue/tasks/main.yml | 10 ++++---- .../targets/hwc_ecs_instance/tasks/main.yml | 8 +++---- .../targets/hwc_evs_disk/tasks/main.yml | 10 ++++---- .../targets/hwc_network_vpc/tasks/main.yml | 8 +++---- .../targets/hwc_smn_topic/tasks/main.yml | 8 +++---- .../targets/hwc_vpc_eip/tasks/main.yml | 8 +++---- .../hwc_vpc_peering_connect/tasks/main.yml | 8 +++---- .../targets/hwc_vpc_port/tasks/main.yml | 8 +++---- .../targets/hwc_vpc_private_ip/tasks/main.yml | 8 +++---- .../targets/hwc_vpc_route/tasks/main.yml | 8 +++---- .../hwc_vpc_security_group/tasks/main.yml | 8 +++---- .../tasks/main.yml | 8 +++---- .../targets/hwc_vpc_subnet/tasks/main.yml | 8 +++---- .../targets/influxdb_user/tasks/tests.yml | 22 ++++++++--------- .../targets/ipify_facts/tasks/main.yml | 6 ++--- .../targets/iso_create/tasks/main.yml | 16 ++++++------- .../targets/iso_extract/tasks/tests.yml | 6 ++--- .../targets/one_host/tasks/main.yml | 2 +- .../test_buildah_synchronize/tasks/main.yml | 4 ++-- .../test-add-children-elements-unicode.yml | 4 ++-- .../xml/tasks/test-add-children-elements.yml | 4 ++-- .../test-add-children-from-groupvars.yml | 4 ++-- .../tasks/test-add-children-insertafter.yml | 4 ++-- .../tasks/test-add-children-insertbefore.yml | 4 ++-- ...t-add-children-with-attributes-unicode.yml | 4 ++-- .../test-add-children-with-attributes.yml | 4 ++-- .../xml/tasks/test-add-element-implicitly.yml | 2 +- .../test-add-namespaced-children-elements.yml | 6 ++--- .../xml/tasks/test-children-elements-xml.yml | 4 ++-- .../targets/xml/tasks/test-count-unicode.yml | 2 +- .../targets/xml/tasks/test-count.yml | 2 +- .../test-get-element-content-unicode.yml | 4 ++-- .../xml/tasks/test-get-element-content.yml | 4 ++-- .../test-mutually-exclusive-attributes.yml | 4 ++-- .../xml/tasks/test-pretty-print-only.yml | 4 ++-- .../targets/xml/tasks/test-pretty-print.yml | 4 ++-- .../tasks/test-remove-attribute-nochange.yml | 4 ++-- .../xml/tasks/test-remove-attribute.yml | 4 ++-- .../tasks/test-remove-element-nochange.yml | 4 ++-- .../targets/xml/tasks/test-remove-element.yml | 4 ++-- ...t-remove-namespaced-attribute-nochange.yml | 4 ++-- .../test-remove-namespaced-attribute.yml | 4 ++-- ...est-remove-namespaced-element-nochange.yml | 4 ++-- .../tasks/test-remove-namespaced-element.yml | 4 ++-- .../test-set-attribute-value-unicode.yml | 4 ++-- .../xml/tasks/test-set-attribute-value.yml | 4 ++-- .../test-set-children-elements-level.yml | 8 +++---- .../test-set-children-elements-unicode.yml | 8 +++---- .../xml/tasks/test-set-children-elements.yml | 8 +++---- .../tasks/test-set-element-value-empty.yml | 4 ++-- .../tasks/test-set-element-value-unicode.yml | 6 ++--- .../xml/tasks/test-set-element-value.yml | 6 ++--- .../test-set-namespaced-attribute-value.yml | 4 ++-- .../test-set-namespaced-children-elements.yml | 6 ++--- .../test-set-namespaced-element-value.yml | 6 ++--- .../targets/xml/tasks/test-xmlstring.yml | 14 +++++------ 69 files changed, 220 insertions(+), 220 deletions(-) diff --git a/tests/integration/targets/archive/tasks/main.yml b/tests/integration/targets/archive/tasks/main.yml index 19a1f6af0c..2267268715 100644 --- a/tests/integration/targets/archive/tasks/main.yml +++ b/tests/integration/targets/archive/tasks/main.yml @@ -174,7 +174,7 @@ - name: Test that the file modes were changed assert: that: - - "archive_02_gz_stat.changed == False " + - archive_02_gz_stat is not changed - "archive_02_gz_stat.stat.mode == '0600'" - "'archived' in archive_bz2_result_02" - "{{ archive_bz2_result_02['archived']| length}} == 3" @@ -199,7 +199,7 @@ - name: Test that the file modes were changed assert: that: - - "archive_02_zip_stat.changed == False" + - archive_02_zip_stat is not changed - "archive_02_zip_stat.stat.mode == '0600'" - "'archived' in archive_zip_result_02" - "{{ archive_zip_result_02['archived']| length}} == 3" @@ -224,7 +224,7 @@ - name: Test that the file modes were changed assert: that: - - "archive_02_bz2_stat.changed == False" + - archive_02_bz2_stat is not changed - "archive_02_bz2_stat.stat.mode == '0600'" - "'archived' in archive_bz2_result_02" - "{{ archive_bz2_result_02['archived']| length}} == 3" @@ -248,7 +248,7 @@ - name: Test that the file modes were changed assert: that: - - "archive_02_xz_stat.changed == False" + - archive_02_xz_stat is not changed - "archive_02_xz_stat.stat.mode == '0600'" - "'archived' in archive_xz_result_02" - "{{ archive_xz_result_02['archived']| length}} == 3" @@ -294,7 +294,7 @@ - name: Assert that nonascii tests succeeded assert: that: - - "nonascii_result_0.changed == true" + - nonascii_result_0 is changed - "nonascii_stat0.stat.exists == true" - name: remove nonascii test @@ -315,7 +315,7 @@ - name: Assert that nonascii tests succeeded assert: that: - - "nonascii_result_1.changed == true" + - nonascii_result_1 is changed - "nonascii_stat_1.stat.exists == true" - name: remove nonascii test @@ -336,7 +336,7 @@ - name: Assert that nonascii tests succeeded assert: that: - - "nonascii_result_1.changed == true" + - nonascii_result_1 is changed - "nonascii_stat_1.stat.exists == true" - name: remove nonascii test @@ -357,7 +357,7 @@ - name: Assert that nonascii tests succeeded assert: that: - - "nonascii_result_2.changed == true" + - nonascii_result_2 is changed - "nonascii_stat_2.stat.exists == true" - name: remove nonascii test diff --git a/tests/integration/targets/flatpak/tasks/check_mode.yml b/tests/integration/targets/flatpak/tasks/check_mode.yml index 065f10dfa7..3186fd2830 100644 --- a/tests/integration/targets/flatpak/tasks/check_mode.yml +++ b/tests/integration/targets/flatpak/tasks/check_mode.yml @@ -13,7 +13,7 @@ - name: Verify addition of absent flatpak test result (check mode) assert: that: - - "addition_result.changed == true" + - addition_result is changed msg: "Adding an absent flatpak shall mark module execution as changed" - name: Test non-existent idempotency of addition of absent flatpak (check mode) @@ -27,7 +27,7 @@ - name: Verify non-existent idempotency of addition of absent flatpak test result (check mode) assert: that: - - "double_addition_result.changed == true" + - double_addition_result is changed msg: | Adding an absent flatpak a second time shall still mark module execution as changed in check mode @@ -44,7 +44,7 @@ - name: Verify removal of absent flatpak test result (check mode) assert: that: - - "removal_result.changed == false" + - removal_result is not changed msg: "Removing an absent flatpak shall mark module execution as not changed" # state=present with url on absent flatpak @@ -60,7 +60,7 @@ - name: Verify addition of absent flatpak with url test result (check mode) assert: that: - - "url_addition_result.changed == true" + - url_addition_result is changed msg: "Adding an absent flatpak from URL shall mark module execution as changed" - name: Test non-existent idempotency of addition of absent flatpak with url (check mode) @@ -76,7 +76,7 @@ result (check mode) assert: that: - - "double_url_addition_result.changed == true" + - double_url_addition_result is changed msg: | Adding an absent flatpak from URL a second time shall still mark module execution as changed in check mode @@ -93,7 +93,7 @@ - name: Verify removal of absent flatpak with url test result (check mode) assert: that: - - "url_removal_result.changed == false" + - url_removal_result is not changed msg: "Removing an absent flatpak shall mark module execution as not changed" @@ -112,7 +112,7 @@ - name: Verify addition test result of present flatpak (check mode) assert: that: - - "addition_present_result.changed == false" + - addition_present_result is not changed msg: "Adding an present flatpak shall mark module execution as not changed" # state=absent on present flatpak @@ -127,7 +127,7 @@ - name: Verify removal of present flatpak test result (check mode) assert: that: - - "removal_present_result.changed == true" + - removal_present_result is changed msg: "Removing a present flatpak shall mark module execution as changed" - name: Test non-existent idempotency of removal (check mode) @@ -140,7 +140,7 @@ - name: Verify non-existent idempotency of removal (check mode) assert: that: - - "double_removal_present_result.changed == true" + - double_removal_present_result is changed msg: | Removing a present flatpak a second time shall still mark module execution as changed in check mode @@ -158,7 +158,7 @@ - name: Verify addition with url of present flatpak test result (check mode) assert: that: - - "url_addition_present_result.changed == false" + - url_addition_present_result is not changed msg: "Adding a present flatpak from URL shall mark module execution as not changed" # state=absent with url on present flatpak @@ -173,7 +173,7 @@ - name: Verify removal with url of present flatpak test result (check mode) assert: that: - - "url_removal_present_result.changed == true" + - url_removal_present_result is changed msg: "Removing an absent flatpak shall mark module execution as not changed" - name: Test non-existent idempotency of removal with url of present flatpak (check mode) @@ -189,5 +189,5 @@ flatpak test result (check mode) assert: that: - - "double_url_removal_present_result.changed == true" + - double_url_removal_present_result is changed msg: Removing an absent flatpak a second time shall still mark module execution as changed diff --git a/tests/integration/targets/flatpak/tasks/main.yml b/tests/integration/targets/flatpak/tasks/main.yml index 45f9ecd501..a1d1bda8a4 100644 --- a/tests/integration/targets/flatpak/tasks/main.yml +++ b/tests/integration/targets/flatpak/tasks/main.yml @@ -40,8 +40,8 @@ - name: Verify executable override test result assert: that: - - "executable_override_result.failed == true" - - "executable_override_result.changed == false" + - executable_override_result is failed + - executable_override_result is not changed msg: "Specifying non-existing executable shall fail module execution" - import_tasks: check_mode.yml diff --git a/tests/integration/targets/flatpak/tasks/test.yml b/tests/integration/targets/flatpak/tasks/test.yml index 20d864a84d..1e7d888bb5 100644 --- a/tests/integration/targets/flatpak/tasks/test.yml +++ b/tests/integration/targets/flatpak/tasks/test.yml @@ -11,7 +11,7 @@ - name: Verify addition test result - {{ method }} assert: that: - - "addition_result.changed == true" + - addition_result is changed msg: "state=present shall add flatpak when absent" - name: Test idempotency of addition - {{ method }} @@ -25,7 +25,7 @@ - name: Verify idempotency of addition test result - {{ method }} assert: that: - - "double_addition_result.changed == false" + - double_addition_result is not changed msg: "state=present shall not do anything when flatpak is already present" # state=absent @@ -40,7 +40,7 @@ - name: Verify removal test result - {{ method }} assert: that: - - "removal_result.changed == true" + - removal_result is changed msg: "state=absent shall remove flatpak when present" - name: Test idempotency of removal - {{ method }} @@ -53,7 +53,7 @@ - name: Verify idempotency of removal test result - {{ method }} assert: that: - - "double_removal_result.changed == false" + - double_removal_result is not changed msg: "state=absent shall not do anything when flatpak is not present" # state=present with url as name @@ -69,7 +69,7 @@ - name: Verify addition test result - {{ method }} assert: that: - - "url_addition_result.changed == true" + - url_addition_result is changed msg: "state=present with url as name shall add flatpak when absent" - name: Test idempotency of addition with url - {{ method }} @@ -83,7 +83,7 @@ - name: Verify idempotency of addition with url test result - {{ method }} assert: that: - - "double_url_addition_result.changed == false" + - double_url_addition_result is not changed msg: "state=present with url as name shall not do anything when flatpak is already present" # state=absent with url as name @@ -98,7 +98,7 @@ - name: Verify removal test result - {{ method }} assert: that: - - "url_removal_result.changed == true" + - url_removal_result is changed msg: "state=absent with url as name shall remove flatpak when present" - name: Test idempotency of removal with url - {{ method }} @@ -111,5 +111,5 @@ - name: Verify idempotency of removal with url test result - {{ method }} assert: that: - - "double_url_removal_result.changed == false" + - double_url_removal_result is not changed msg: "state=absent with url as name shall not do anything when flatpak is not present" diff --git a/tests/integration/targets/flatpak_remote/tasks/check_mode.yml b/tests/integration/targets/flatpak_remote/tasks/check_mode.yml index 7ce89a8c15..1f4def86d9 100644 --- a/tests/integration/targets/flatpak_remote/tasks/check_mode.yml +++ b/tests/integration/targets/flatpak_remote/tasks/check_mode.yml @@ -13,7 +13,7 @@ - name: Verify addition of absent flatpak remote test result (check mode) assert: that: - - "addition_result.changed == true" + - addition_result is changed msg: "Adding an absent flatpak remote shall mark module execution as changed" - name: Test non-existent idempotency of addition of absent flatpak remote (check mode) @@ -29,7 +29,7 @@ test result (check mode) assert: that: - - "double_addition_result.changed == true" + - double_addition_result is changed msg: | Adding an absent flatpak remote a second time shall still mark module execution as changed in check mode @@ -46,7 +46,7 @@ - name: Verify removal of absent flatpak remote test result (check mode) assert: that: - - "removal_result.changed == false" + - removal_result is not changed msg: "Removing an absent flatpak remote shall mark module execution as not changed" @@ -65,7 +65,7 @@ - name: Verify addition of present flatpak remote test result (check mode) assert: that: - - "addition_result.changed == false" + - addition_result is not changed msg: "Adding a present flatpak remote shall mark module execution as not changed" # state=absent @@ -80,7 +80,7 @@ - name: Verify removal of present flatpak remote test result (check mode) assert: that: - - "removal_result.changed == true" + - removal_result is changed msg: "Removing a present flatpak remote shall mark module execution as changed" - name: Test non-existent idempotency of removal of present flatpak remote (check mode) @@ -95,7 +95,7 @@ test result (check mode) assert: that: - - "double_removal_result.changed == true" + - double_removal_result is changed msg: | Removing a present flatpak remote a second time shall still mark module execution as changed in check mode diff --git a/tests/integration/targets/flatpak_remote/tasks/main.yml b/tests/integration/targets/flatpak_remote/tasks/main.yml index aa2219e181..91fa7262df 100644 --- a/tests/integration/targets/flatpak_remote/tasks/main.yml +++ b/tests/integration/targets/flatpak_remote/tasks/main.yml @@ -40,8 +40,8 @@ - name: Verify executable override test result assert: that: - - "executable_override_result.failed == true" - - "executable_override_result.changed == false" + - executable_override_result is failed + - executable_override_result is not changed msg: "Specifying non-existing executable shall fail module execution" - import_tasks: check_mode.yml diff --git a/tests/integration/targets/flatpak_remote/tasks/test.yml b/tests/integration/targets/flatpak_remote/tasks/test.yml index 9570f623a1..66c43649b4 100644 --- a/tests/integration/targets/flatpak_remote/tasks/test.yml +++ b/tests/integration/targets/flatpak_remote/tasks/test.yml @@ -11,7 +11,7 @@ - name: Verify addition test result - {{ method }} assert: that: - - "addition_result.changed == true" + - addition_result is changed msg: "state=present shall add flatpak when absent" - name: Test idempotency of addition - {{ method }} @@ -25,7 +25,7 @@ - name: Verify idempotency of addition test result - {{ method }} assert: that: - - "double_addition_result.changed == false" + - double_addition_result is not changed msg: "state=present shall not do anything when flatpak is already present" - name: Test updating remote url does not do anything - {{ method }} @@ -39,7 +39,7 @@ - name: Verify updating remote url does not do anything - {{ method }} assert: that: - - "url_update_result.changed == false" + - url_update_result is not changed msg: "Trying to update the URL of an existing flatpak remote shall not do anything" @@ -55,7 +55,7 @@ - name: Verify removal test result - {{ method }} assert: that: - - "removal_result.changed == true" + - removal_result is changed msg: "state=absent shall remove flatpak when present" - name: Test idempotency of removal - {{ method }} @@ -68,5 +68,5 @@ - name: Verify idempotency of removal test result - {{ method }} assert: that: - - "double_removal_result.changed == false" + - double_removal_result is not changed msg: "state=absent shall not do anything when flatpak is not present" diff --git a/tests/integration/targets/git_config/tasks/get_set_no_state.yml b/tests/integration/targets/git_config/tasks/get_set_no_state.yml index 149a9b2d93..7e9714a75e 100644 --- a/tests/integration/targets/git_config/tasks/get_set_no_state.yml +++ b/tests/integration/targets/git_config/tasks/get_set_no_state.yml @@ -17,9 +17,9 @@ - name: assert set changed and value is correct assert: that: - - set_result.changed == true + - set_result is changed - set_result.diff.before == "\n" - set_result.diff.after == option_value + "\n" - - get_result.changed == false + - get_result is not changed - get_result.config_value == option_value ... diff --git a/tests/integration/targets/git_config/tasks/get_set_state_present.yml b/tests/integration/targets/git_config/tasks/get_set_state_present.yml index 59f3c9c0ee..52d986d633 100644 --- a/tests/integration/targets/git_config/tasks/get_set_state_present.yml +++ b/tests/integration/targets/git_config/tasks/get_set_state_present.yml @@ -19,9 +19,9 @@ - name: assert set changed and value is correct with state=present assert: that: - - set_result.changed == true + - set_result is changed - set_result.diff.before == "\n" - set_result.diff.after == option_value + "\n" - - get_result.changed == false + - get_result is not changed - get_result.config_value == option_value ... diff --git a/tests/integration/targets/git_config/tasks/precedence_between_unset_and_value.yml b/tests/integration/targets/git_config/tasks/precedence_between_unset_and_value.yml index 24ef292015..9eb4ca4034 100644 --- a/tests/integration/targets/git_config/tasks/precedence_between_unset_and_value.yml +++ b/tests/integration/targets/git_config/tasks/precedence_between_unset_and_value.yml @@ -18,7 +18,7 @@ - name: assert unset changed and deleted value assert: that: - - unset_result.changed == true + - unset_result is changed - unset_result.diff.before == option_value + "\n" - unset_result.diff.after == "\n" - get_result.config_value == '' diff --git a/tests/integration/targets/git_config/tasks/unset_check_mode.yml b/tests/integration/targets/git_config/tasks/unset_check_mode.yml index c8fe00c0b7..43b9905373 100644 --- a/tests/integration/targets/git_config/tasks/unset_check_mode.yml +++ b/tests/integration/targets/git_config/tasks/unset_check_mode.yml @@ -18,7 +18,7 @@ - name: assert unset changed but dit not delete value assert: that: - - unset_result.changed == true + - unset_result is changed - unset_result.diff.before == option_value + "\n" - unset_result.diff.after == "\n" - get_result.config_value == option_value diff --git a/tests/integration/targets/git_config/tasks/unset_no_value.yml b/tests/integration/targets/git_config/tasks/unset_no_value.yml index 71568e3aa4..5fb6b6bcb6 100644 --- a/tests/integration/targets/git_config/tasks/unset_no_value.yml +++ b/tests/integration/targets/git_config/tasks/unset_no_value.yml @@ -17,7 +17,7 @@ - name: assert unsetting didn't change assert: that: - - unset_result.changed == false + - unset_result is not changed - unset_result.msg == 'no setting to unset' - get_result.config_value == '' ... diff --git a/tests/integration/targets/git_config/tasks/unset_value.yml b/tests/integration/targets/git_config/tasks/unset_value.yml index a2308156aa..6dda37736e 100644 --- a/tests/integration/targets/git_config/tasks/unset_value.yml +++ b/tests/integration/targets/git_config/tasks/unset_value.yml @@ -17,7 +17,7 @@ - name: assert unset changed and deleted value assert: that: - - unset_result.changed == true + - unset_result is changed - unset_result.diff.before == option_value + "\n" - unset_result.diff.after == "\n" - get_result.config_value == '' diff --git a/tests/integration/targets/github_issue/tasks/main.yml b/tests/integration/targets/github_issue/tasks/main.yml index 24266128ae..7731a7a955 100644 --- a/tests/integration/targets/github_issue/tasks/main.yml +++ b/tests/integration/targets/github_issue/tasks/main.yml @@ -18,8 +18,8 @@ - assert: that: - - "{{ get_status_0002.changed == True }}" - - "{{ get_status_0002.issue_status == 'closed' }}" + - get_status_0002 is changed + - get_status_0002.issue_status == 'closed' - name: Check if GitHub issue is closed or not github_issue: @@ -32,6 +32,6 @@ - assert: that: - - "{{ get_status_0003.changed == False }}" - - "{{ get_status_0003.failed == True }}" - - "{{ 'Failed' in get_status_0003.msg }}" + - get_status_0003 is not changed + - get_status_0003 is failed + - "'Failed' in get_status_0003.msg" diff --git a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml index 8c8ea2eb3d..4d36c11286 100644 --- a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml +++ b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml @@ -167,8 +167,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a instance (check mode) hwc_ecs_instance: @@ -277,8 +277,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a disk diff --git a/tests/integration/targets/hwc_evs_disk/tasks/main.yml b/tests/integration/targets/hwc_evs_disk/tasks/main.yml index 79e67d0dc9..e2380450cd 100644 --- a/tests/integration/targets/hwc_evs_disk/tasks/main.yml +++ b/tests/integration/targets/hwc_evs_disk/tasks/main.yml @@ -50,8 +50,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a disk (check mode) hwc_evs_disk: @@ -92,7 +92,7 @@ - name: assert changed is false assert: that: - - result.changed == false + - result is not changed # ---------------------------------------------------------------------------- - name: delete a disk that does not exist hwc_evs_disk: @@ -105,5 +105,5 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed diff --git a/tests/integration/targets/hwc_network_vpc/tasks/main.yml b/tests/integration/targets/hwc_network_vpc/tasks/main.yml index 5c01cf7ad8..e3b979d0b5 100644 --- a/tests/integration/targets/hwc_network_vpc/tasks/main.yml +++ b/tests/integration/targets/hwc_network_vpc/tasks/main.yml @@ -62,8 +62,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a vpc hwc_network_vpc: @@ -97,5 +97,5 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed diff --git a/tests/integration/targets/hwc_smn_topic/tasks/main.yml b/tests/integration/targets/hwc_smn_topic/tasks/main.yml index 180f8fad3e..a9879aea54 100644 --- a/tests/integration/targets/hwc_smn_topic/tasks/main.yml +++ b/tests/integration/targets/hwc_smn_topic/tasks/main.yml @@ -44,8 +44,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a smn topic hwc_smn_topic: @@ -77,5 +77,5 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed diff --git a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml index 57de832418..bdf5d763a7 100644 --- a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml @@ -96,8 +96,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a eip (check mode) hwc_vpc_eip: @@ -159,8 +159,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a port diff --git a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml index 2316a4b25c..cb6a15f750 100644 --- a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml @@ -78,8 +78,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a peering connect (check mode) hwc_vpc_peering_connect: @@ -133,8 +133,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a vpc diff --git a/tests/integration/targets/hwc_vpc_port/tasks/main.yml b/tests/integration/targets/hwc_vpc_port/tasks/main.yml index b7f28360c1..00f5ae8b2e 100644 --- a/tests/integration/targets/hwc_vpc_port/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_port/tasks/main.yml @@ -69,8 +69,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a port (check mode) hwc_vpc_port: @@ -116,8 +116,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a subnet diff --git a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml index efd6765c80..5531d575f8 100644 --- a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml @@ -70,8 +70,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a private ip (check mode) hwc_vpc_private_ip: @@ -117,8 +117,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a subnet diff --git a/tests/integration/targets/hwc_vpc_route/tasks/main.yml b/tests/integration/targets/hwc_vpc_route/tasks/main.yml index b281000b7a..9c9c37e8c0 100644 --- a/tests/integration/targets/hwc_vpc_route/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_route/tasks/main.yml @@ -81,8 +81,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a route (check mode) hwc_vpc_route: @@ -127,8 +127,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a peering connect diff --git a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml index 6b21f8b9a4..9f853ca8e7 100644 --- a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml @@ -51,8 +51,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a security group (check mode) hwc_vpc_security_group: @@ -83,5 +83,5 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed diff --git a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml index 2d774101bf..04213e7162 100644 --- a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml @@ -85,8 +85,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a security group rule (check mode) hwc_vpc_security_group_rule: @@ -151,8 +151,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a security group diff --git a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml index 3b3cf65478..c16ff85241 100644 --- a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml +++ b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml @@ -77,8 +77,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #---------------------------------------------------------- - name: delete a subnet (check mode) hwc_vpc_subnet: @@ -136,8 +136,8 @@ - name: assert changed is false assert: that: - - result.failed == 0 - - result.changed == false + - result is not failed + - result is not changed #--------------------------------------------------------- # Post-test teardown - name: delete a vpc diff --git a/tests/integration/targets/influxdb_user/tasks/tests.yml b/tests/integration/targets/influxdb_user/tasks/tests.yml index b980e29094..ad3396642b 100644 --- a/tests/integration/targets/influxdb_user/tasks/tests.yml +++ b/tests/integration/targets/influxdb_user/tasks/tests.yml @@ -13,7 +13,7 @@ - name: Check that admin user adding succeeds with a change assert: that: - - add_admin_user.changed == true + - add_admin_user is changed - name: Test add admin user block: @@ -24,7 +24,7 @@ - name: Check that admin user adding succeeds with a change assert: that: - - add_admin_user.changed == true + - add_admin_user is changed - name: Test add admin user idempotence block: @@ -35,7 +35,7 @@ - name: Check that admin user adding succeeds without a change assert: that: - - add_admin_user.changed == false + - add_admin_user is not changed - name: Enable authentication and restart service block: @@ -58,7 +58,7 @@ - name: Check that adding user with enabled authentication succeeds with a change assert: that: - - add_user_with_auth_enabled.changed == true + - add_user_with_auth_enabled is changed - name: Test add user when authentication enabled block: @@ -69,7 +69,7 @@ - name: Check that adding user with enabled authentication succeeds with a change assert: that: - - add_user_with_auth_enabled.changed == true + - add_user_with_auth_enabled is changed - name: Test add user when authentication enabled idempotence block: @@ -80,7 +80,7 @@ - name: Check that adding same user succeeds without a change assert: that: - - same_user.changed == false + - same_user is not changed - name: Test change user password in check mode block: @@ -92,7 +92,7 @@ - name: Check that password changing succeeds with a change assert: that: - - change_password.changed == true + - change_password is changed - name: Test change user password block: @@ -103,7 +103,7 @@ - name: Check that password changing succeeds with a change assert: that: - - change_password.changed == true + - change_password is changed - name: Test remove user in check mode block: @@ -115,7 +115,7 @@ - name: Check that removing user succeeds with a change assert: that: - - remove_user.changed == true + - remove_user is changed - name: Test remove user block: @@ -126,7 +126,7 @@ - name: Check that removing user succeeds with a change assert: that: - - remove_user.changed == true + - remove_user is changed - name: Test remove user idempotence block: @@ -137,4 +137,4 @@ - name: Check that removing user succeeds without a change assert: that: - - remove_user.changed == false + - remove_user is not changed diff --git a/tests/integration/targets/ipify_facts/tasks/main.yml b/tests/integration/targets/ipify_facts/tasks/main.yml index 4fbd5ab696..7b620ff9ec 100644 --- a/tests/integration/targets/ipify_facts/tasks/main.yml +++ b/tests/integration/targets/ipify_facts/tasks/main.yml @@ -41,6 +41,6 @@ - name: check if task was successful assert: that: - - "{{ external_ip.changed == false }}" - - "{{ external_ip['ansible_facts'] is defined }}" - - "{{ external_ip['ansible_facts']['ipify_public_ip'] is defined }}" + - external_ip is not changed + - external_ip.ansible_facts is defined + - external_ip.ansible_facts.ipify_public_ip is defined diff --git a/tests/integration/targets/iso_create/tasks/main.yml b/tests/integration/targets/iso_create/tasks/main.yml index de46276743..4a0df3b818 100644 --- a/tests/integration/targets/iso_create/tasks/main.yml +++ b/tests/integration/targets/iso_create/tasks/main.yml @@ -35,7 +35,7 @@ - debug: var=iso_file - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == False - name: Create iso file with a specified file @@ -54,7 +54,7 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True - name: Create iso file with a specified file and folder @@ -74,10 +74,10 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True -- name: Create iso file with volume identification string +- name: Create iso file with volume identification string iso_create: src_files: - "{{ role_path }}/files/test1.cfg" @@ -93,7 +93,7 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True - name: Create iso file with Rock Ridge extention @@ -112,7 +112,7 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True - name: Create iso file with Joliet extention @@ -131,7 +131,7 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True - name: Create iso file with UDF enabled @@ -150,5 +150,5 @@ - assert: that: - - iso_result.changed == True + - iso_result is changed - iso_file.stat.exists == True diff --git a/tests/integration/targets/iso_extract/tasks/tests.yml b/tests/integration/targets/iso_extract/tasks/tests.yml index f9182ba6ae..18f22422ce 100644 --- a/tests/integration/targets/iso_extract/tasks/tests.yml +++ b/tests/integration/targets/iso_extract/tasks/tests.yml @@ -28,7 +28,7 @@ - assert: that: - - iso_extract_test0 is changed == true + - iso_extract_test0 is changed - name: Extract the iso again iso_extract: @@ -42,11 +42,11 @@ - name: Test iso_extract_test0_again (normal mode) assert: that: - - iso_extract_test0_again is changed == false + - iso_extract_test0_again is not changed when: not in_check_mode - name: Test iso_extract_test0_again (check-mode) assert: that: - - iso_extract_test0_again is changed == true + - iso_extract_test0_again is changed when: in_check_mode diff --git a/tests/integration/targets/one_host/tasks/main.yml b/tests/integration/targets/one_host/tasks/main.yml index a3cea768af..7d38c2a890 100644 --- a/tests/integration/targets/one_host/tasks/main.yml +++ b/tests/integration/targets/one_host/tasks/main.yml @@ -177,7 +177,7 @@ - name: "assert test_{{test_number}} worked" assert: that: - - result.changed == false + - result is not changed # HOST DISABLEMENT diff --git a/tests/integration/targets/synchronize-buildah/roles/test_buildah_synchronize/tasks/main.yml b/tests/integration/targets/synchronize-buildah/roles/test_buildah_synchronize/tasks/main.yml index 92fd0830c4..a80e218921 100644 --- a/tests/integration/targets/synchronize-buildah/roles/test_buildah_synchronize/tasks/main.yml +++ b/tests/integration/targets/synchronize-buildah/roles/test_buildah_synchronize/tasks/main.yml @@ -40,7 +40,7 @@ - assert: that: - "'changed' in sync_result" - - "sync_result.changed == true" + - sync_result is changed - "'cmd' in sync_result" - "'rsync' in sync_result.cmd" - "'msg' in sync_result" @@ -63,7 +63,7 @@ - assert: that: - - "sync_result.changed == False" + - sync_result is not changed - name: cleanup old files file: diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml index 8ad91501c3..d89c29ae27 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml @@ -24,6 +24,6 @@ - name: Test expected result assert: that: - - add_children_elements_unicode.changed == true - - comparison.changed == false # identical + - add_children_elements_unicode is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-children-elements-unicode.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-children-elements.yml index 8d9b06866d..3c439c7ac2 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-elements.yml @@ -24,6 +24,6 @@ - name: Test expected result assert: that: - - add_children_elements.changed == true - - comparison.changed == false # identical + - add_children_elements is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml index e062de8d14..818fdf09b9 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - add_children_from_groupvars.changed == true - - comparison.changed == false # identical + - add_children_from_groupvars is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-children-from-groupvars.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml index 2d42e2d54e..479052ebdd 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml @@ -28,5 +28,5 @@ - name: Test expected result assert: that: - - add_children_insertafter.changed == true - - comparison.changed == false # identical + - add_children_insertafter is changed + - comparison is not changed # identical diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml index 8550f12cf7..9839d7cc91 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml @@ -28,5 +28,5 @@ - name: Test expected result assert: that: - - add_children_insertbefore.changed == true - - comparison.changed == false # identical + - add_children_insertbefore is changed + - comparison is not changed # identical diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml index d4a2329f69..585157c970 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml @@ -26,6 +26,6 @@ - name: Test expected result assert: that: - - add_children_with_attributes_unicode.changed == true - - comparison.changed == false # identical + - add_children_with_attributes_unicode is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-children-with-attributes-unicode.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml index 91e92637fc..c3704801d9 100644 --- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml +++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml @@ -29,7 +29,7 @@ - name: Test expected result assert: that: - - add_children_with_attributes.changed == true - - comparison.changed == false # identical + - add_children_with_attributes is changed + - comparison is not changed # identical when: lxml_predictable_attribute_order #command: diff -u {{ role_path }}/results/test-add-children-with-attributes.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml index db674ba4fc..6166cd46b9 100644 --- a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml +++ b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml @@ -108,7 +108,7 @@ - name: Test expected result assert: that: - - comparison.changed == false # identical + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-element-implicitly.yml /tmp/ansible-xml-beers-implicit.xml diff --git a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml index 25eca47f5b..2cac73e65c 100644 --- a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml @@ -21,12 +21,12 @@ src: results/test-add-namespaced-children-elements.xml dest: /tmp/ansible-xml-namespaced-beers.xml check_mode: yes - diff: yes + diff: yes register: comparison - name: Test expected result assert: that: - - add_namespaced_children_elements.changed == true - - comparison.changed == false # identical + - add_namespaced_children_elements is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-namespaced-children-elements.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml index e63100c47c..6b50d819c3 100644 --- a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml +++ b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml @@ -25,6 +25,6 @@ - name: Test expected result assert: that: - - children_elements.changed == true - - comparison.changed == false # identical + - children_elements is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-count-unicode.yml b/tests/integration/targets/xml/tasks/test-count-unicode.yml index 47a806bf98..a9a462b5da 100644 --- a/tests/integration/targets/xml/tasks/test-count-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-count-unicode.yml @@ -15,5 +15,5 @@ - name: Test expected result assert: that: - - beers.changed == false + - beers is not changed - beers.count == 2 diff --git a/tests/integration/targets/xml/tasks/test-count.yml b/tests/integration/targets/xml/tasks/test-count.yml index cbc97e323c..b8a21870f7 100644 --- a/tests/integration/targets/xml/tasks/test-count.yml +++ b/tests/integration/targets/xml/tasks/test-count.yml @@ -15,5 +15,5 @@ - name: Test expected result assert: that: - - beers.changed == false + - beers is not changed - beers.count == 3 diff --git a/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml b/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml index 73ae96674f..718f12d640 100644 --- a/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml @@ -15,7 +15,7 @@ - name: Test expected result assert: that: - - get_element_attribute.changed == false + - get_element_attribute is not changed - get_element_attribute.matches[0]['rating'] is defined and get_element_attribute.matches[0]['rating']['subjective'] == 'да' - name: Get element text @@ -28,5 +28,5 @@ - name: Test expected result assert: that: - - get_element_text.changed == false + - get_element_text is not changed - get_element_text.matches[0]['rating'] == 'десять' diff --git a/tests/integration/targets/xml/tasks/test-get-element-content.yml b/tests/integration/targets/xml/tasks/test-get-element-content.yml index 4a40b42dcf..d38aa70d95 100644 --- a/tests/integration/targets/xml/tasks/test-get-element-content.yml +++ b/tests/integration/targets/xml/tasks/test-get-element-content.yml @@ -15,7 +15,7 @@ - name: Test expected result assert: that: - - get_element_attribute.changed == false + - get_element_attribute is not changed - get_element_attribute.matches[0]['rating'] is defined - get_element_attribute.matches[0]['rating']['subjective'] == 'true' @@ -43,5 +43,5 @@ - name: Test expected result assert: that: - - get_element_text.changed == false + - get_element_text is not changed - get_element_text.matches[0]['rating'] == '10' diff --git a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml index 3f24b0ac84..07a71f9153 100644 --- a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml +++ b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml @@ -18,5 +18,5 @@ - name: Test expected result assert: that: - - module_output.changed == false - - module_output.failed == true + - module_output is not changed + - module_output is failed diff --git a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml index 7c0f7d5fd6..16fcf629c5 100644 --- a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml +++ b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml @@ -24,6 +24,6 @@ - name: Test expected result assert: that: - - pretty_print_only.changed == true - - comparison.changed == false # identical + - pretty_print_only is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-pretty-print.yml b/tests/integration/targets/xml/tasks/test-pretty-print.yml index 88b618b25d..fd47ff3d82 100644 --- a/tests/integration/targets/xml/tasks/test-pretty-print.yml +++ b/tests/integration/targets/xml/tasks/test-pretty-print.yml @@ -25,6 +25,6 @@ - name: Test expected result assert: that: - - pretty_print.changed == true - - comparison.changed == false # identical + - pretty_print is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml index d09dee405c..fbd73237f1 100644 --- a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - remove_attribute.changed == false - - comparison.changed == false # identical + - remove_attribute is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-attribute.yml index 9aa395e666..52b5214213 100644 --- a/tests/integration/targets/xml/tasks/test-remove-attribute.yml +++ b/tests/integration/targets/xml/tasks/test-remove-attribute.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - remove_attribute.changed == true - - comparison.changed == false # identical + - remove_attribute is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml index 2debc80d51..e548bfabf8 100644 --- a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - remove_element.changed == false - - comparison.changed == false # identical + - remove_element is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-element.yml b/tests/integration/targets/xml/tasks/test-remove-element.yml index f2e20ea220..092ca3e033 100644 --- a/tests/integration/targets/xml/tasks/test-remove-element.yml +++ b/tests/integration/targets/xml/tasks/test-remove-element.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - remove_element.changed == true - - comparison.changed == false # identical + - remove_element is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml index 291536d3bf..19c14dec8d 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml @@ -28,6 +28,6 @@ - name: Test expected result assert: that: - - remove_namespaced_attribute.changed == false - - comparison.changed == false # identical + - remove_namespaced_attribute is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml index a7ccdac4e3..9e54911ba5 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml @@ -28,6 +28,6 @@ - name: Test expected result assert: that: - - remove_namespaced_attribute.changed == true - - comparison.changed == false # identical + - remove_namespaced_attribute is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml index b1938e45b7..b96f2a7819 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml @@ -28,6 +28,6 @@ - name: Test expected result assert: that: - - remove_namespaced_element.changed == false - - comparison.changed == false # identical + - remove_namespaced_element is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml index be78af6803..660baa9840 100644 --- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml +++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml @@ -28,6 +28,6 @@ - name: Test expected result assert: that: - - remove_namespaced_element.changed == true - - comparison.changed == false # identical + - remove_namespaced_element is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml index dabf72a1b7..b72d502f12 100644 --- a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml @@ -24,6 +24,6 @@ - name: Test expected result assert: that: - - set_attribute_value_unicode.changed == true - - comparison.changed == false # identical + - set_attribute_value_unicode is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-attribute-value-unicode.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml index 2aa39fe22f..6a2aa6c511 100644 --- a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml @@ -24,6 +24,6 @@ - name: Test expected result assert: that: - - set_attribute_value.changed == true - - comparison.changed == false # identical + - set_attribute_value is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-attribute-value.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml index 3e2c0adb6f..7fa926e879 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml @@ -47,8 +47,8 @@ - name: Test expected result assert: that: - - set_children_elements_level.changed == true - - comparison.changed == false # identical + - set_children_elements_level is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-children-elements-level.xml /tmp/ansible-xml-beers.xml @@ -70,5 +70,5 @@ - name: Test expected result assert: that: - - set_children_again.changed == false - - comparison.changed == false # identical + - set_children_again is not changed + - comparison is not changed # identical diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml index 240b894ac7..3cc25cd999 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml @@ -25,8 +25,8 @@ - name: Test expected result assert: that: - - set_children_elements_unicode.changed == true - - comparison.changed == false # identical + - set_children_elements_unicode is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml @@ -41,6 +41,6 @@ - name: Test expected result assert: that: - - set_children_again.changed == false - - comparison.changed == false # identical + - set_children_again is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-children-elements.yml index 7b0f3247ad..7c305ead74 100644 --- a/tests/integration/targets/xml/tasks/test-set-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-set-children-elements.yml @@ -25,8 +25,8 @@ - name: Test expected result assert: that: - - set_children_elements.changed == true - - comparison.changed == false # identical + - set_children_elements is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml @@ -48,6 +48,6 @@ - name: Test expected result assert: that: - - set_children_again.changed == false - - comparison.changed == false # identical + - set_children_again is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml index 5814803cb7..4575d5e75f 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml @@ -23,6 +23,6 @@ - name: Test expected result assert: that: - - set_element_value_empty.changed == true - - comparison.changed == false # identical + - set_element_value_empty is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-element-value-empty.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml index c3a40b7d93..139087fcd9 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml @@ -37,7 +37,7 @@ - name: Test expected result assert: that: - - set_element_first_run.changed == true - - set_element_second_run.changed == false - - comparison.changed == false # identical + - set_element_first_run is changed + - set_element_second_run is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-element-value-unicode.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-element-value.yml b/tests/integration/targets/xml/tasks/test-set-element-value.yml index dbd070f139..2f845e949b 100644 --- a/tests/integration/targets/xml/tasks/test-set-element-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-element-value.yml @@ -37,7 +37,7 @@ - name: Test expected result assert: that: - - set_element_first_run.changed == true - - set_element_second_run.changed == false - - comparison.changed == false # identical + - set_element_first_run is changed + - set_element_second_run is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-element-value.xml /tmp/ansible-xml-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml index e0086efe3a..2ba83a8330 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml @@ -29,6 +29,6 @@ - name: Test expected result assert: that: - - set_namespaced_attribute_value.changed == true - - comparison.changed == false # identical + - set_namespaced_attribute_value is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-set-namespaced-attribute-value.xml /tmp/ansible-xml-namespaced-beers.xml diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml index 8e66e70eeb..6204c8c74d 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml @@ -52,6 +52,6 @@ - name: Test expected result assert: that: - - set_children_again.changed == false # idempotency - - set_namespaced_attribute_value.changed == true - - comparison.changed == false # identical + - set_children_again is not changed # idempotency + - set_namespaced_attribute_value is changed + - comparison is not changed # identical diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml index f77d7537e9..cf6a8a7eb0 100644 --- a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml +++ b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml @@ -41,6 +41,6 @@ - name: Test expected result assert: that: - - set_element_first_run.changed == true - - set_element_second_run.changed == false - - comparison.changed == false # identical + - set_element_first_run is changed + - set_element_second_run is not changed + - comparison is not changed # identical diff --git a/tests/integration/targets/xml/tasks/test-xmlstring.yml b/tests/integration/targets/xml/tasks/test-xmlstring.yml index 4620d984fa..82781fa94d 100644 --- a/tests/integration/targets/xml/tasks/test-xmlstring.yml +++ b/tests/integration/targets/xml/tasks/test-xmlstring.yml @@ -25,8 +25,8 @@ - name: Test expected result assert: that: - - xmlresponse.changed == false - - comparison.changed == false # identical + - xmlresponse is not changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml @@ -49,8 +49,8 @@ - name: Test expected result assert: that: - - xmlresponse.changed == true - - comparison.changed == false # identical + - xmlresponse is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml @@ -63,7 +63,7 @@ add_children: - beer: Old Rasputin register: xmlresponse_modification - + - name: Compare to expected result copy: content: '{{ xmlresponse_modification.xmlstring }}' @@ -76,6 +76,6 @@ - name: Test expected result assert: that: - - xmlresponse_modification.changed == true - - comparison.changed == false # identical + - xmlresponse_modification is changed + - comparison is not changed # identical #command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml