mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Ansible.ModuleUtils.FileUtil: catch DirectoryNotFoundException when testing a path (#37968)
This commit is contained in:
parent
63da50e1d8
commit
68e44e082e
3 changed files with 22 additions and 1 deletions
|
@ -17,7 +17,7 @@ Function Test-AnsiblePath {
|
||||||
# Replacement for Test-Path
|
# Replacement for Test-Path
|
||||||
try {
|
try {
|
||||||
$file_attributes = [System.IO.File]::GetAttributes($Path)
|
$file_attributes = [System.IO.File]::GetAttributes($Path)
|
||||||
} catch [System.IO.FileNotFoundException] {
|
} catch [System.IO.FileNotFoundException], [System.IO.DirectoryNotFoundException] {
|
||||||
return $false
|
return $false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,14 @@ if ($pagefile) {
|
||||||
$actual = Test-AnsiblePath -Path C:\fakefile
|
$actual = Test-AnsiblePath -Path C:\fakefile
|
||||||
Assert-Equals -actual $actual -expected $false
|
Assert-Equals -actual $actual -expected $false
|
||||||
|
|
||||||
|
# Test-AnsiblePath Directory that doesn't exist
|
||||||
|
$actual = Test-AnsiblePath -Path C:\fakedirectory
|
||||||
|
Assert-Equals -actual $actual -expected $false
|
||||||
|
|
||||||
|
# Test-AnsiblePath file in non-existant directory
|
||||||
|
$actual = Test-AnsiblePath -Path C:\fakedirectory\fakefile.txt
|
||||||
|
Assert-Equals -actual $actual -expected $false
|
||||||
|
|
||||||
# Test-AnsiblePath Normal directory
|
# Test-AnsiblePath Normal directory
|
||||||
$actual = Test-AnsiblePath -Path C:\Windows
|
$actual = Test-AnsiblePath -Path C:\Windows
|
||||||
Assert-Equals -actual $actual -expected $true
|
Assert-Equals -actual $actual -expected $true
|
||||||
|
|
|
@ -144,6 +144,19 @@
|
||||||
that:
|
that:
|
||||||
- statout.stat.exists == true
|
- statout.stat.exists == true
|
||||||
|
|
||||||
|
# https://github.com/ansible/ansible/issues/37967
|
||||||
|
- name: test creates with file in missing directory
|
||||||
|
win_shell: echo hi
|
||||||
|
args:
|
||||||
|
creates: c:\fakefolder\fakefolder2\fakefile.txt
|
||||||
|
register: shellout
|
||||||
|
|
||||||
|
- name: validate result
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- shellout.skipped is not defined
|
||||||
|
- shellout.changed
|
||||||
|
|
||||||
- name: run with removes, should remove
|
- name: run with removes, should remove
|
||||||
win_shell: Remove-Item c:\testfile.txt
|
win_shell: Remove-Item c:\testfile.txt
|
||||||
args:
|
args:
|
||||||
|
|
Loading…
Reference in a new issue