From 3d46670622e5f7dc124976566d91f071e52c5b65 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 13 Oct 2021 12:58:30 -0700 Subject: [PATCH] Remove incidental_win_ping test. (#76031) It no longer provides any unique test coverage. ci_complete ci_coverage --- .../targets/incidental_win_ping/aliases | 2 - .../library/win_ping_set_attr.ps1 | 31 --------- .../library/win_ping_strict_mode_error.ps1 | 30 --------- .../library/win_ping_syntax_error.ps1 | 30 --------- .../library/win_ping_throw.ps1 | 30 --------- .../library/win_ping_throw_string.ps1 | 30 --------- .../incidental_win_ping/tasks/main.yml | 67 ------------------- test/sanity/ignore.txt | 1 - test/utils/shippable/incidental/windows.sh | 31 ++------- 9 files changed, 5 insertions(+), 247 deletions(-) delete mode 100644 test/integration/targets/incidental_win_ping/aliases delete mode 100644 test/integration/targets/incidental_win_ping/library/win_ping_set_attr.ps1 delete mode 100644 test/integration/targets/incidental_win_ping/library/win_ping_strict_mode_error.ps1 delete mode 100644 test/integration/targets/incidental_win_ping/library/win_ping_syntax_error.ps1 delete mode 100644 test/integration/targets/incidental_win_ping/library/win_ping_throw.ps1 delete mode 100644 test/integration/targets/incidental_win_ping/library/win_ping_throw_string.ps1 delete mode 100644 test/integration/targets/incidental_win_ping/tasks/main.yml diff --git a/test/integration/targets/incidental_win_ping/aliases b/test/integration/targets/incidental_win_ping/aliases deleted file mode 100644 index a5fc90dcf48..00000000000 --- a/test/integration/targets/incidental_win_ping/aliases +++ /dev/null @@ -1,2 +0,0 @@ -shippable/windows/incidental -windows diff --git a/test/integration/targets/incidental_win_ping/library/win_ping_set_attr.ps1 b/test/integration/targets/incidental_win_ping/library/win_ping_set_attr.ps1 deleted file mode 100644 index f17049643b4..00000000000 --- a/test/integration/targets/incidental_win_ping/library/win_ping_set_attr.ps1 +++ /dev/null @@ -1,31 +0,0 @@ -#!powershell -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# POWERSHELL_COMMON - -$params = Parse-Args $args $true; - -$data = Get-Attr $params "data" "pong"; - -$result = @{ - changed = $false - ping = "pong" -}; - -# Test that Set-Attr will replace an existing attribute. -Set-Attr $result "ping" $data - -Exit-Json $result; diff --git a/test/integration/targets/incidental_win_ping/library/win_ping_strict_mode_error.ps1 b/test/integration/targets/incidental_win_ping/library/win_ping_strict_mode_error.ps1 deleted file mode 100644 index 508174afcc6..00000000000 --- a/test/integration/targets/incidental_win_ping/library/win_ping_strict_mode_error.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -#!powershell -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# POWERSHELL_COMMON - -$params = Parse-Args $args $true; - -$params.thisPropertyDoesNotExist - -$data = Get-Attr $params "data" "pong"; - -$result = @{ - changed = $false - ping = $data -}; - -Exit-Json $result; diff --git a/test/integration/targets/incidental_win_ping/library/win_ping_syntax_error.ps1 b/test/integration/targets/incidental_win_ping/library/win_ping_syntax_error.ps1 deleted file mode 100644 index d4c9f07ad55..00000000000 --- a/test/integration/targets/incidental_win_ping/library/win_ping_syntax_error.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -#!powershell -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# POWERSHELL_COMMON - -$blah = 'I can't quote my strings correctly.' - -$params = Parse-Args $args $true; - -$data = Get-Attr $params "data" "pong"; - -$result = @{ - changed = $false - ping = $data -}; - -Exit-Json $result; diff --git a/test/integration/targets/incidental_win_ping/library/win_ping_throw.ps1 b/test/integration/targets/incidental_win_ping/library/win_ping_throw.ps1 deleted file mode 100644 index 7306f4d2808..00000000000 --- a/test/integration/targets/incidental_win_ping/library/win_ping_throw.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -#!powershell -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# POWERSHELL_COMMON - -throw - -$params = Parse-Args $args $true; - -$data = Get-Attr $params "data" "pong"; - -$result = @{ - changed = $false - ping = $data -}; - -Exit-Json $result; diff --git a/test/integration/targets/incidental_win_ping/library/win_ping_throw_string.ps1 b/test/integration/targets/incidental_win_ping/library/win_ping_throw_string.ps1 deleted file mode 100644 index 09e3b7cb458..00000000000 --- a/test/integration/targets/incidental_win_ping/library/win_ping_throw_string.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -#!powershell -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# POWERSHELL_COMMON - -throw "no ping for you" - -$params = Parse-Args $args $true; - -$data = Get-Attr $params "data" "pong"; - -$result = @{ - changed = $false - ping = $data -}; - -Exit-Json $result; diff --git a/test/integration/targets/incidental_win_ping/tasks/main.yml b/test/integration/targets/incidental_win_ping/tasks/main.yml deleted file mode 100644 index a7e6ba7fc4e..00000000000 --- a/test/integration/targets/incidental_win_ping/tasks/main.yml +++ /dev/null @@ -1,67 +0,0 @@ -# test code for the win_ping module -# (c) 2014, Chris Church - -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -- name: test win_ping - action: win_ping - register: win_ping_result - -- name: check win_ping result - assert: - that: - - win_ping_result is not failed - - win_ping_result is not changed - - win_ping_result.ping == 'pong' - -- name: test win_ping with data - win_ping: - data: ☠ - register: win_ping_with_data_result - -- name: check win_ping result with data - assert: - that: - - win_ping_with_data_result is not failed - - win_ping_with_data_result is not changed - - win_ping_with_data_result.ping == '☠' - -- name: test win_ping.ps1 with data as complex args - # win_ping.ps1: # TODO: do we want to actually support this? no other tests that I can see... - win_ping: - data: bleep - register: win_ping_ps1_result - -- name: check win_ping.ps1 result with data - assert: - that: - - win_ping_ps1_result is not failed - - win_ping_ps1_result is not changed - - win_ping_ps1_result.ping == 'bleep' - -- name: test win_ping using data=crash so that it throws an exception - win_ping: - data: crash - register: win_ping_crash_result - ignore_errors: yes - -- name: check win_ping_crash result - assert: - that: - - win_ping_crash_result is failed - - win_ping_crash_result is not changed - - 'win_ping_crash_result.msg == "Unhandled exception while executing module: boom"' - - '"throw \"boom\"" in win_ping_crash_result.exception' diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 3a110170e23..403579abafb 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -149,7 +149,6 @@ test/integration/targets/incidental_win_dsc/files/xTestDsc/1.0.0/DSCResources/AN test/integration/targets/incidental_win_dsc/files/xTestDsc/1.0.0/xTestDsc.psd1 pslint!skip test/integration/targets/incidental_win_dsc/files/xTestDsc/1.0.1/DSCResources/ANSIBLE_xTestResource/ANSIBLE_xTestResource.psm1 pslint!skip test/integration/targets/incidental_win_dsc/files/xTestDsc/1.0.1/xTestDsc.psd1 pslint!skip -test/integration/targets/incidental_win_ping/library/win_ping_syntax_error.ps1 pslint!skip test/integration/targets/incidental_win_reboot/templates/post_reboot.ps1 pslint!skip test/integration/targets/json_cleanup/library/bad_json shebang test/integration/targets/lookup_csvfile/files/crlf.csv line-endings diff --git a/test/utils/shippable/incidental/windows.sh b/test/utils/shippable/incidental/windows.sh index 0ca11bfac6f..54527d52344 100755 --- a/test/utils/shippable/incidental/windows.sh +++ b/test/utils/shippable/incidental/windows.sh @@ -12,10 +12,6 @@ target="shippable/windows/incidental/" stage="${S:-prod}" provider="${P:-default}" -# python versions to test in order -IFS=' ' read -r -a python_versions <<< \ - "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(" ".join(constants.CONTROLLER_PYTHON_VERSIONS))')" - # python version to run full tests on while other versions run minimal tests python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(constants.CONTROLLER_MIN_PYTHON_VERSION)')" @@ -49,25 +45,8 @@ else ) fi -for version in "${python_versions[@]}"; do - if [ "${version}" == "${python_default}" ]; then - # full tests - ci="${target}" - else - # minimal tests for other python versions - ci="incidental_win_ping" - fi - - # terminate remote instances on the final python version tested - if [ "${version}" = "${python_versions[-1]}" ]; then - terminate="always" - else - terminate="never" - fi - - # shellcheck disable=SC2086 - ansible-test windows-integration --color -v --retry-on-error "${ci}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - "${platforms[@]}" \ - --docker default --python "${version}" \ - --remote-terminate "${terminate}" --remote-stage "${stage}" --remote-provider "${provider}" -done +# shellcheck disable=SC2086 +ansible-test windows-integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ + "${platforms[@]}" \ + --docker default --python "${python_default}" \ + --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"