Merged PR 359836: Finally fix the error output, fix routing formattin…

…g, add a test/cleanup script. Finally fix the error output, fix routing formatting, add a test/cleanup script.
ngi644 · Aug 8, 2017 · 509d249 · 509d249
1 parent 96e5d60
commit 509d249
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Microsoft.Azure.Devices.Edge.sln b/Microsoft.Azure.Devices.Edge.sln
@@ -86,6 +86,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{DB96
 		scripts\windows\DownloadAndInstallCertificate.ps1 = scripts\windows\DownloadAndInstallCertificate.ps1
 		scripts\windows\installPrereqs.ps1 = scripts\windows\installPrereqs.ps1
 		scripts\windows\runTests.bat = scripts\windows\runTests.bat
+		scripts\windows\runTests.ps1 = scripts\windows\runTests.ps1
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Routing.Core", "edge-hub\src\Microsoft.Azure.Devices.Routing.Core\Microsoft.Azure.Devices.Routing.Core.csproj", "{9479C3D7-F565-4135-97C9-1B5D1199C259}"

diff --git a/edge-service/src/Microsoft.Azure.Devices.Edge.Service/scripts/windows/deploy.ps1 b/edge-service/src/Microsoft.Azure.Devices.Edge.Service/scripts/windows/deploy.ps1
@@ -48,8 +48,9 @@ $docker_routes=""
 if ($Routes)
 {
     $array = $Routes.Split(",")
-    for ($i=0; $i -lt $array.length; $i++) {
-        $docker_routes += " -e routes__$i=" + $array[$i]
+    for ($i=0; $i -lt $array.length; $i++)
+    {
+        $docker_routes += (" -e routes__{0}=`"{1}`"" -f $i, $array[$i])
     }
     Write-Host "Docker routes $docker_routes"
 }
@@ -82,9 +83,9 @@ if ($LastExitCode)
     Throw "Docker Pull Failed With Exit Code $LastExitCode"
 }
 
-docker stop $image_name 2>&1 | Out-String
+& cmd /c "docker stop $image_name 2>&1"
 
-docker rm $image_name 2>&1 | Out-String
+& cmd /c "docker rm $image_name 2>&1"
 
 $run_command = "docker run "
 if (-not $Foreground)

diff --git a/scripts/windows/runTests.ps1 b/scripts/windows/runTests.ps1
@@ -0,0 +1,4 @@
+# TODO: validate that service is running, it started simulatedtemperaturesensor module, and that that one is sending telemetry to the hub
+
+# This will at least validate that the container exists
+docker rm -f edge-service