win_regedit: stabilise tests (ansible#38912)

(cherry picked from commit 77ef480)
jborean93 · Apr 17, 2018 · cd1f895 · cd1f895
1 parent 9178def
commit cd1f895
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/ansible/modules/windows/win_regedit.ps1 b/lib/ansible/modules/windows/win_regedit.ps1
@@ -562,6 +562,7 @@ $key_prefix[$path]
 } finally {
     if ($hive) {
         [GC]::Collect()
+        [GC]::WaitForPendingFinalizers()
         try {
             [Ansible.RegistryUtil]::UnloadHive("ANSIBLE")
         } catch [System.ComponentModel.Win32Exception] {

diff --git a/test/integration/targets/win_regedit/tasks/tests.yml b/test/integration/targets/win_regedit/tasks/tests.yml
@@ -537,7 +537,6 @@
     $prop = Get-ItemProperty -Path HKLM:\ANSIBLE\NewKey -Name TestProp -ErrorAction SilentlyContinue
     if ($prop) {
       $prop.TestProp
-      $prop.Close()
     }
     &reg.exe unload HKLM\ANSIBLE > $null
     exit 0
@@ -565,7 +564,6 @@
     $prop = Get-ItemProperty -Path HKLM:\ANSIBLE\NewKey -Name TestProp -ErrorAction SilentlyContinue
     if ($prop) {
       $prop.TestProp
-      $prop.Close()
     }
     &reg.exe unload HKLM\ANSIBLE > $null
     exit 0
@@ -607,7 +605,6 @@
     $prop = Get-ItemProperty -Path HKLM:\ANSIBLE\NewKey -Name TestProp -ErrorAction SilentlyContinue
     if ($prop) {
       $prop.TestProp
-      $prop.Close()
     }
     &reg.exe unload HKLM\ANSIBLE > $null
     exit 0
@@ -633,7 +630,6 @@
     $prop = Get-ItemProperty -Path HKLM:\ANSIBLE\NewKey -Name TestProp -ErrorAction SilentlyContinue
     if ($prop) {
       $prop.TestProp
-      $prop.Close()
     }
     &reg.exe unload HKLM\ANSIBLE > $null
     exit 0
@@ -662,7 +658,7 @@
   win_regedit:
     path: '{{test_win_regedit_hive_key}}'
     state: absent
-    delete_yes: yes
+    delete_key: yes
     hive: C:\Users\Default\NTUSER.dat
   register: remove_key_in_hive_check
   check_mode: yes
@@ -688,7 +684,7 @@
   win_regedit:
     path: '{{test_win_regedit_hive_key}}'
     state: absent
-    delete_yes: yes
+    delete_key: yes
     hive: C:\Users\Default\NTUSER.dat
   register: remove_key_in_hive
 
@@ -713,7 +709,7 @@
   win_regedit:
     path: '{{test_win_regedit_hive_key}}'
     state: absent
-    delete_yes: yes
+    delete_key: yes
     hive: C:\Users\Default\NTUSER.dat
   register: remove_key_in_hive_again