Fix import statement in all tests (dsccommunity#563)

[skip ci]
gstorme · Feb 14, 2020 · bbc6aea · bbc6aea
1 parent 60b7fb7
commit bbc6aea
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 
 - xWebAdministration
   - Update GitVersion.yml with the correct regular expression.
+  - Fix import statement in all tests, making sure it throws if module
+    DscResource.Test cannot be imported.
 - xWebsite
   - Fixed HTTPS binding issue causing failure when CertificateSubject matches
     multiple certificates.

diff --git a/tests/Integration/MSFT_WebApplicationHandler.Integration.Tests.ps1 b/tests/Integration/MSFT_WebApplicationHandler.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName    = 'MSFT_WebApplicationHandler'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_XIISLogging.Integration.Tests.ps1 b/tests/Integration/MSFT_XIISLogging.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xIISLogging'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xIISFeatureDelegation.Integration.Tests.ps1 b/tests/Integration/MSFT_xIISFeatureDelegation.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xIISFeatureDelegation'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xIISHandler.Integration.Tests.ps1 b/tests/Integration/MSFT_xIISHandler.Integration.Tests.ps1
@@ -4,7 +4,7 @@ $script:dscResourceName    = 'MSFT_xIISHandler'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xIISMimeTypeMapping.Integration.Tests.ps1 b/tests/Integration/MSFT_xIISMimeTypeMapping.Integration.Tests.ps1
@@ -4,7 +4,7 @@ $script:dscResourceName = 'MSFT_xIISMimeTypeMapping'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xSslSettings.Integration.Tests.ps1 b/tests/Integration/MSFT_xSslSettings.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xSslSettings'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebAppPool.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebAppPool.Integration.Tests.ps1
@@ -5,7 +5,7 @@ $script:dscResourceName = 'MSFT_xWebAppPool'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebAppPoolDefaults.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebAppPoolDefaults.Integration.Tests.ps1
@@ -10,7 +10,7 @@ $script:dscResourceName    = 'MSFT_xWebAppPoolDefaults'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebApplication.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebApplication.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xWebApplication'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebConfigKeyValue.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebConfigKeyValue.Integration.Tests.ps1
@@ -4,7 +4,7 @@ $script:dscResourceName = 'MSFT_xWebConfigKeyValue'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebConfigProperty.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebConfigProperty.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = "MSFT_xWebConfigProperty"
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebConfigPropertyCollection.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebConfigPropertyCollection.Integration.Tests.ps1
@@ -4,7 +4,7 @@ $script:dscResourceName = "MSFT_xWebConfigPropertyCollection"
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebSite.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebSite.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xWebSite'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebSiteDefaults.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebSiteDefaults.Integration.Tests.ps1
@@ -4,7 +4,7 @@ $script:dscResourceName = 'MSFT_xWebSiteDefaults'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Integration/MSFT_xWebVirtualDirectory.Integration.Tests.ps1 b/tests/Integration/MSFT_xWebVirtualDirectory.Integration.Tests.ps1
@@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_xWebVirtualDirectory'
 
 try
 {
-    Import-Module -Name DscResource.Test -Force
+    Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
 }
 catch [System.IO.FileNotFoundException]
 {

diff --git a/tests/Unit/MSFT_WebApplicationHandler.Tests.ps1 b/tests/Unit/MSFT_WebApplicationHandler.Tests.ps1
@@ -5,7 +5,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xIISFeatureDelegation.Tests.ps1 b/tests/Unit/MSFT_xIISFeatureDelegation.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xIISHandler.Tests.ps1 b/tests/Unit/MSFT_xIISHandler.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xIISLogging.Tests.ps1 b/tests/Unit/MSFT_xIISLogging.Tests.ps1
@@ -5,7 +5,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xIisMimeTypeMapping.Tests.ps1 b/tests/Unit/MSFT_xIisMimeTypeMapping.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xSslSettings.Tests.ps1 b/tests/Unit/MSFT_xSslSettings.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebAppPool.Tests.ps1 b/tests/Unit/MSFT_xWebAppPool.Tests.ps1
@@ -11,7 +11,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebAppPoolDefaults.Tests.ps1 b/tests/Unit/MSFT_xWebAppPoolDefaults.Tests.ps1
@@ -30,7 +30,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebApplication.Tests.ps1 b/tests/Unit/MSFT_xWebApplication.Tests.ps1
@@ -5,7 +5,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebConfigKeyValue.Tests.ps1 b/tests/Unit/MSFT_xWebConfigKeyValue.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebConfigProperty.Tests.ps1 b/tests/Unit/MSFT_xWebConfigProperty.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebConfigPropertyCollection.Tests.ps1 b/tests/Unit/MSFT_xWebConfigPropertyCollection.Tests.ps1
@@ -7,7 +7,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebVirtualDirectory.Tests.ps1 b/tests/Unit/MSFT_xWebVirtualDirectory.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {

diff --git a/tests/Unit/MSFT_xWebsite.Tests.ps1 b/tests/Unit/MSFT_xWebsite.Tests.ps1
@@ -6,7 +6,7 @@ function Invoke-TestSetup
 {
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ $script:dscResourceName = 'MSFT_WebApplicationHandler' @@
     try
     {
-        Import-Module -Name DscResource.Test -Force
+        Import-Module -Name DscResource.Test -Force -ErrorAction 'Stop'
     }
     catch [System.IO.FileNotFoundException]
     {
@@ Expand Down @@