Merge pull request MicrosoftDocs#432 from Microsoft/plang-debug1

Adding docker version info and error CSV file
glaisne · Oct 19, 2016 · 890f4ff · 890f4ff
2 parents ddad8fa + 7e440cc
commit 890f4ff
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/windows-server-container-tools/Debug-ContainerHost/Debug-ContainerHost.ps1 b/windows-server-container-tools/Debug-ContainerHost/Debug-ContainerHost.ps1
@@ -1,5 +1,7 @@
 Write-Output "Checking for common problems"
 
+$filesToDump = @{}
+
 Describe "Windows Version and Prerequisites" {
     $buildNumber = (Get-CimInstance -Namespace root\cimv2 Win32_OperatingSystem).BuildNumber
     It "Is Windows 10 Anniversary Update or Windows Server 2016" {
@@ -28,12 +30,22 @@ Describe "Docker is installed" {
         $service.Status | Should Be Running
     }
     It "Docker.exe is in path" {
-        { Start-Process -NoNewWindow `
+        # This also captures 'docker info' and 'docker version' output to be shown later
+        { 
+            Start-Process -NoNewWindow `
                         -Wait `
                         -FilePath docker.exe `
                         -ArgumentList "info" `
                         -RedirectStandardError err.txt `
-                        -RedirectStandardOutput out.txt 
+                        -RedirectStandardOutput dockerinfo.txt
+            $filesToDump["docker info"] = "dockerinfo.txt"
+            Start-Process -NoNewWindow `
+                        -Wait `
+                        -FilePath docker.exe `
+                        -ArgumentList "version" `
+                        -RedirectStandardError err.txt `
+                        -RedirectStandardOutput dockerversion.txt
+            $filesToDump["docker version"] = "dockerversion.txt"
         } | Should Not Throw
     }
 }
@@ -44,9 +56,6 @@ Describe "User has permissions to use Docker daemon" {
     }
 }
 
-if (Test-Path err.txt) { Remove-Item err.txt}
-if (Test-Path out.txt) { Remove-Item out.txt}
-
 Describe "Windows container settings are correct" {
      It "Do not have DisableVSmbOplock set to 1" {
          $regvalue = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Virtualization\Containers" -Name VSmbDisableOplocks -ErrorAction Ignore
@@ -79,6 +88,17 @@ Describe "The right container base images are installed" {
     }
 }
 
+# Dump & Cleanup temporary files used during Pester tests
+$filesToDump.Keys | ForEach-Object {
+     if (Test-Path $filesToDump[$_]) {
+         Write-Output "Showing output from: $($_)"
+         Get-Content $filesToDump[$_] | Write-Output
+         Remove-Item $filesToDump[$_]
+         Write-Output ""
+     }
+}
+
+if (Test-Path err.txt) { Remove-Item err.txt}
 
 Write-Output "Warnings & errors from the last 24 hours"
 $logStartTime = (Get-Date).AddHours(-24)
@@ -91,4 +111,9 @@ $logNames = "Microsoft-Windows-Containers-Wcifs/Operational",
 $levels = 3,2,1,0
 $providers = "Docker", "Microsoft-Windows-Hyper-V-Compute"
 
-Get-WinEvent -FilterHashtable @{Logname=$logNames; StartTime=$logStartTime; Level=$levels; ProviderName=$providers} -ErrorAction Ignore
+$events = Get-WinEvent -FilterHashtable @{Logname=$logNames; StartTime=$logStartTime; Level=$levels; ProviderName=$providers} -ErrorAction Ignore
+
+$eventCsv = "logs_$((get-date).ToString("yyyyMMdd'-'HHmmss")).csv"
+$events | Format-Table
+$events | Export-CSV $eventCsv
+Write-Host "Logs saved to $($PWD)\$($eventCsv)"
diff --git a/windows-server-container-tools/Debug-ContainerHost/README.md b/windows-server-container-tools/Debug-ContainerHost/README.md
@@ -122,7 +122,6 @@ These registry values should not be needed, and can be removed. Some past test b
 
 ## Contributing to Debug-ContainerHost.ps1
 Contributions are welcome! Here are a few suggested areas needing improvement:
-- Include `docker info` and `docker version` output
 - Add options to start & stop log collections to Debug-ContainerHost.ps1, create CSV file
 - Add a commitId and date to script output so it's easier to troubleshoot the troubleshooting script
 - Search for TODO in *.ps1 for incomplete tests