From f2d5954d11a1707cdb70b01dfb27c722b6416295 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 11 Sep 2018 08:23:46 +1000 Subject: [PATCH] win_say - fix up syntax and test issues (#45450) (cherry picked from commit c9c141fb6a51d6b77274958a2340fa54754db692) --- changelogs/fragments/win_say-fix.yaml | 2 ++ lib/ansible/modules/windows/win_say.ps1 | 2 +- test/integration/targets/win_say/tasks/main.yml | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/win_say-fix.yaml diff --git a/changelogs/fragments/win_say-fix.yaml b/changelogs/fragments/win_say-fix.yaml new file mode 100644 index 00000000000..b2312c32f2f --- /dev/null +++ b/changelogs/fragments/win_say-fix.yaml @@ -0,0 +1,2 @@ +bugfixes: +- win_say - fix syntax error in module and get tests working diff --git a/lib/ansible/modules/windows/win_say.ps1 b/lib/ansible/modules/windows/win_say.ps1 index 0ac630393be..a752c269762 100644 --- a/lib/ansible/modules/windows/win_say.ps1 +++ b/lib/ansible/modules/windows/win_say.ps1 @@ -21,7 +21,7 @@ $result = @{ $words = $null -f ($speech_speed -lt -10 -or $speech_speed -gt 10) { +if ($speech_speed -lt -10 -or $speech_speed -gt 10) { Fail-Json $result "speech_speed needs to a integer in the range -10 to 10. The value $speech_speed is outside this range." } diff --git a/test/integration/targets/win_say/tasks/main.yml b/test/integration/targets/win_say/tasks/main.yml index 60448723a8c..2355839b4a4 100644 --- a/test/integration/targets/win_say/tasks/main.yml +++ b/test/integration/targets/win_say/tasks/main.yml @@ -1,18 +1,24 @@ +# CI hosts don't have a valid Speech package so we rely on check mode for basic +# sanity tests +--- - name: Warn of impending deployment win_say: msg: Warning, deployment commencing in 5 minutes, please log out. + check_mode: yes - name: Using a different voice and a start sound win_say: msg: Warning, deployment commencing in 5 minutes, please log out. start_sound_path: C:\Windows\Media\ding.wav voice: Microsoft Hazel Desktop + check_mode: yes - name: Example with start and end sound win_say: msg: New software installed start_sound_path: C:\Windows\Media\Windows Balloon.wav end_sound_path: C:\Windows\Media\chimes.wav + check_mode: yes - name: Create message file win_copy: @@ -24,6 +30,7 @@ msg_file: C:\Windows\Temp\win_say_message.txt start_sound_path: C:\Windows\Media\Windows Balloon.wav end_sound_path: C:\Windows\Media\chimes.wav + check_mode: yes - name: Remove message file win_file: @@ -34,3 +41,4 @@ win_say: speech_speed: 5 msg: Stay calm and proceed to the closest fire exit. + check_mode: yes