summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/integration/targets/connection_winrm/aliases1
-rw-r--r--test/integration/targets/win_chocolatey/tasks/main.yml79
-rw-r--r--test/integration/targets/win_template/aliases1
3 files changed, 38 insertions, 43 deletions
diff --git a/test/integration/targets/connection_winrm/aliases b/test/integration/targets/connection_winrm/aliases
index c6d6198167..8ad5ddbe28 100644
--- a/test/integration/targets/connection_winrm/aliases
+++ b/test/integration/targets/connection_winrm/aliases
@@ -1 +1,2 @@
windows/ci/group3
+windows/ci/smoketest
diff --git a/test/integration/targets/win_chocolatey/tasks/main.yml b/test/integration/targets/win_chocolatey/tasks/main.yml
index 538dfd9554..6e461b4abc 100644
--- a/test/integration/targets/win_chocolatey/tasks/main.yml
+++ b/test/integration/targets/win_chocolatey/tasks/main.yml
@@ -16,53 +16,46 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
-- name: simple failure smoke test # NB: this is the only test that runs under shippable until others can use non-internet endpoints
+- name: install sysinternals
win_chocolatey:
- register: choco_fail
- failed_when: "not choco_fail.msg | regex_search('Missing required argument: name')"
+ name: sysinternals
+ state: present
+ register: install_sysinternals
-- when: lookup('env', 'ANSIBLE_TEST_CI') != 'shippable'
- block:
- - name: install sysinternals
- win_chocolatey:
- name: sysinternals
- state: present
- register: install_sysinternals
+- name: verify install sysinternals
+ assert:
+ that:
+ - 'install_sysinternals.changed == true'
- - name: verify install sysinternals
- assert:
- that:
- - 'install_sysinternals.changed == true'
-
- - name: install sysinternals again
- win_chocolatey:
- name: sysinternals
- state: present
- register: install_sysinternals_again
-
- - name: verify install sysinternals again
- assert:
- that:
- - 'install_sysinternals_again.changed == false'
+- name: install sysinternals again
+ win_chocolatey:
+ name: sysinternals
+ state: present
+ register: install_sysinternals_again
- - name: remove sysinternals
- win_chocolatey:
- name: sysinternals
- state: absent
- register: remove_sysinternals
+- name: verify install sysinternals again
+ assert:
+ that:
+ - 'install_sysinternals_again.changed == false'
- - name: verify remove sysinternals
- assert:
- that:
- - 'remove_sysinternals.changed == true'
+- name: remove sysinternals
+ win_chocolatey:
+ name: sysinternals
+ state: absent
+ register: remove_sysinternals
- - name: remove sysinternals again
- win_chocolatey:
- name: sysinternals
- state: absent
- register: remove_sysinternals_again
+- name: verify remove sysinternals
+ assert:
+ that:
+ - 'remove_sysinternals.changed == true'
- - name: verify remove sysinternals again
- assert:
- that:
- - 'remove_sysinternals_again.changed == false'
+- name: remove sysinternals again
+ win_chocolatey:
+ name: sysinternals
+ state: absent
+ register: remove_sysinternals_again
+
+- name: verify remove sysinternals again
+ assert:
+ that:
+ - 'remove_sysinternals_again.changed == false'
diff --git a/test/integration/targets/win_template/aliases b/test/integration/targets/win_template/aliases
index ee0ed5974e..c72bb881db 100644
--- a/test/integration/targets/win_template/aliases
+++ b/test/integration/targets/win_template/aliases
@@ -1 +1,2 @@
windows/ci/group2
+windows/ci/smoketest