win_timezone - ensure original timezone is restored at end of test

ansible-collections · Nov 27, 2024 · 206199f · 206199f
1 parent ebdfa63
commit 206199f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/tests/integration/targets/win_timezone/tasks/main.yml b/tests/integration/targets/win_timezone/tasks/main.yml
@@ -1,12 +1,9 @@
-- name: Determine if server has tzutil.exe installed
-  ansible.windows.win_command: tzutil.exe /l
-  register: tzutil
-  ignore_errors: yes
-
-- name: Only run tests if tzutil.exe is installed
-  when: tzutil.rc == 0
-  block:
+- name: get current timezone
+  win_command: tzutil.exe /g
+  register: original_timezone
+  changed_when: false
 
+- block:
   - name: Test in normal mode
     import_tasks: tests.yml
     vars:
@@ -17,3 +14,8 @@
     vars:
       in_check_mode: yes
     check_mode: yes
+
+  always:
+  - name: reset timezone back to defaults
+    win_timezone:
+      timezone: "{{ original_timezone.stdout | trim }}"
diff --git a/tests/integration/targets/win_timezone/tasks/tests.yml b/tests/integration/targets/win_timezone/tasks/tests.yml
@@ -97,4 +97,4 @@
 
 - name: Restore original timezone
   win_timezone:
-    timezone: '{{ original.timezone }}'
+    timezone: '{{ original.previous_timezone }}'