cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

win_regedit: stabilise tests (#38912)

Browse source
This commit is contained in:
Jordan Borean 2018-04-18 08:11:44 +10:00 committed by GitHub
parent 26312b6557
commit 77ef4802f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/modules/windows/win_regedit.ps1
View file

@ -562,6 +562,7 @@ $key_prefix[$path]
} finally {
if ($hive) {
[GC]::Collect()
[GC]::WaitForPendingFinalizers()
try {
[Ansible.RegistryUtil]::UnloadHive("ANSIBLE")
} catch [System.ComponentModel.Win32Exception] {

1
test/integration/targets/win_regedit/aliases
View file

@ -1,2 +1 @@
windows/ci/group2
unstable

10
test/integration/targets/win_regedit/tasks/tests.yml
View file

@ -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