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

Get-FileChecksum allways returns a string now,

Browse source 
and the test_win_copy integration tests that depend on the checksum
have been updated in this change too.
This commit is contained in:
Jon Hawkesworth 2015-06-01 21:53:49 +01:00
parent e36b7130ff
commit 30b92a6f4c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/powershell.ps1
View file

@ -151,7 +151,7 @@ Function Get-FileChecksum($path)
{ {
$sp = new-object -TypeName System.Security.Cryptography.SHA1CryptoServiceProvider; $sp = new-object -TypeName System.Security.Cryptography.SHA1CryptoServiceProvider;
$fp = [System.IO.File]::Open($path, [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read); $fp = [System.IO.File]::Open($path, [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read);
[System.BitConverter]::ToString($sp.ComputeHash($fp)).Replace("-", "").ToLower(); $hash = [System.BitConverter]::ToString($sp.ComputeHash($fp)).Replace("-", "").ToLower();
$fp.Dispose(); $fp.Dispose();
} }
ElseIf (Test-Path -PathType Container $path) ElseIf (Test-Path -PathType Container $path)

4
test/integration/roles/test_win_copy/tasks/main.yml
View file

@ -62,7 +62,7 @@
- name: verify that the file checksum is correct - name: verify that the file checksum is correct
assert: assert:
that: that:
- "copy_result.checksum[0] == 'c79a6506c1c948be0d456ab5104d5e753ab2f3e6'" - "copy_result.checksum == 'c79a6506c1c948be0d456ab5104d5e753ab2f3e6'"
- name: check the stat results of the file - name: check the stat results of the file
win_stat: path={{output_file}} win_stat: path={{output_file}}
@ -78,7 +78,7 @@
# - "stat_results.stat.isfifo == false" # - "stat_results.stat.isfifo == false"
# - "stat_results.stat.isreg == true" # - "stat_results.stat.isreg == true"
# - "stat_results.stat.issock == false" # - "stat_results.stat.issock == false"
- "stat_results.stat.checksum[0] == 'c79a6506c1c948be0d456ab5104d5e753ab2f3e6'" - "stat_results.stat.checksum == 'c79a6506c1c948be0d456ab5104d5e753ab2f3e6'"
- name: overwrite the file via same means - name: overwrite the file via same means
win_copy: src=foo.txt dest={{output_file}} win_copy: src=foo.txt dest={{output_file}}