From 00bb4818cec8f8676369d59f0eb33f7802ca37f2 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Wed, 21 Oct 2020 15:50:53 +0300
Subject: [PATCH] fixed pipx packages tests

---
 images/macos/tests/Linters.Tests.ps1      | 4 ----
 images/macos/tests/PipxPackages.Tests.ps1 | 7 +++++++
 images/macos/toolsets/toolset-10.13.json  | 2 +-
 images/macos/toolsets/toolset-10.14.json  | 2 +-
 images/macos/toolsets/toolset-10.15.json  | 2 +-
 images/macos/toolsets/toolset-11.0.json   | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 images/macos/tests/PipxPackages.Tests.ps1

diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1
index 3b7b8e0df..31d3698cc 100644
--- a/images/macos/tests/Linters.Tests.ps1
+++ b/images/macos/tests/Linters.Tests.ps1
@@ -3,10 +3,6 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
 $os = Get-OSVersion
 
 Describe "Linters" {
-    It "yamllint" {
-        "yamllint --version" | Should -ReturnZeroExitCode
-    }
-
     It "SwiftLint" -Skip:($os.IsHighSierra) {
         "swiftlint version" | Should -ReturnZeroExitCode
     }
diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1
new file mode 100644
index 000000000..ed9819388
--- /dev/null
+++ b/images/macos/tests/PipxPackages.Tests.ps1
@@ -0,0 +1,7 @@
+Describe "PipxPackages" {
+    $pipxToolset = Get-ToolsetValue "pipx"
+    $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} }
+    It "<package>" -TestCases $testCases {
+        "$cmd" | Should -ReturnZeroExitCode
+    }
+}
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json
index f1ce3b065..3bf629685 100644
--- a/images/macos/toolsets/toolset-10.13.json
+++ b/images/macos/toolsets/toolset-10.13.json
@@ -198,7 +198,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index f1c70a837..aa1b41019 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -258,7 +258,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index e2debc9f2..c54db9197 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -167,7 +167,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index e5cf3e64f..ed8903d38 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -92,7 +92,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file