summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Davis <mdavis@ansible.com>2016-11-29 14:19:51 -0800
committerMatt Davis <mdavis@ansible.com>2016-11-29 14:20:33 -0800
commit6890003c4f8dcd8f63a5b280211068cfaf1dcc35 (patch)
tree60a5fbf2b6e2d959906f314b19dee204cc20fb86
parent30fb384e7fb9a94ac3929e4a650877e45d8834c9 (diff)
downloadansible-modules-core-6890003c4f8dcd8f63a5b280211068cfaf1dcc35.tar.gz
Fix test failures in win_command/win_shell on Powershell 3
Switched to use Exit-Json to avoid JSON escaping bugs in ConvertTo-Json formatter without -Compress option.
-rw-r--r--windows/win_command.ps12
-rw-r--r--windows/win_shell.ps12
2 files changed, 2 insertions, 2 deletions
diff --git a/windows/win_command.ps1 b/windows/win_command.ps1
index 2a03b6a0..316654b8 100644
--- a/windows/win_command.ps1
+++ b/windows/win_command.ps1
@@ -158,4 +158,4 @@ $result.start = $start_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff")
$result.end = $end_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff")
$result.delta = $($end_datetime - $start_datetime).ToString("h\:mm\:ss\.ffffff")
-ConvertTo-Json -Depth 99 $result
+Exit-Json $result
diff --git a/windows/win_shell.ps1 b/windows/win_shell.ps1
index 850f2b95..664858e5 100644
--- a/windows/win_shell.ps1
+++ b/windows/win_shell.ps1
@@ -139,4 +139,4 @@ $result.start = $start_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff")
$result.end = $end_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff")
$result.delta = $($end_datetime - $start_datetime).ToString("h\:mm\:ss\.ffffff")
-ConvertTo-Json -Depth 99 $result
+Exit-Json $result