Merge branch 'master' of https://github.com/SQLDBAWithABeard/Functions.git

Author: SQLDBAWithABeard

Test-OLA.ps1

@@ -67,17 +67,18 @@ Describe "Testing $Server Backup solution" {
     {
       $CheckForDBFolders -eq $true
     }
-    }
-
         if($Share.StartsWith('\\') -eq $False)
     {
       $UNC = $Share.Replace(':','$')
       $Root = '\\' + $ServerName + '\' + $UNC + '\' + $Folder
     }
     else
     {
-    $Root = $Share + '\' + $Folder
+      $Root = $Share + '\' + $Folder
     }
+    }
+
+
 
     Context "New Backup Jobs on $server" {
         It "Agent should be running" {
@@ -177,20 +178,37 @@ Describe "Testing $Server Backup solution" {
         }
         }
         }
-                foreach($db in $dbs.Where{$_ -ne 'tempdb'})
+        foreach($db in $dbs.Where{$_ -ne 'tempdb'})
         {
+ 
           if($Srv.VersionMajor -ge 11)
             {
                 If($srv.Databases[$db].AvailabilityGroupName)
                 {
                      $AG = $srv.Databases[$db].AvailabilityGroupName
                      $Cluster = $srv.ClusterName
                      $OLAAg = $Cluster + '$' + $AG
-                     $Root =  $Share + '\' + $OlaAG 
+                    if($Share.StartsWith('\\') -eq $False)
+                    {
+                      $UNC = $Share.Replace(':','$')
+                      $Root = '\\' + $ServerName + '\' + $UNC + '\' + $OlaAG 
+                    }
+                    else
+                    {
+                      $Root = '\\' + $ServerName + '\' + $UNC + '\' + $Folder
+                    }
                 }
                 else
                 {
-                    $Root =  $Share + '\' + $Server
+                  if($Share.StartsWith('\\') -eq $False)
+                    {
+                      $UNC = $Share.Replace(':','$')
+                      $Root = '\\' + $ServerName + '\' + $UNC + '\' + $Folder
+                    }
+                    else
+                    {
+                      $Root = $Share + '\' + $Folder
+                    }
                 }
             }
             $dbfoldername = $db.Replace(' ','')

Test-OLAInstance.ps1

@@ -110,11 +110,11 @@ DontCheckJobOutcome  = $DontCheckJobOutcome }
 if($Report)
 {
 $Date = Get-Date -Format ddMMyyyHHmmss
+$tempFolder = 'c:\temp'
 $File = $tempFolder + '\Script_Pester_Report_' + $date
 $XML = $File + '.xml'
 $HTML = $file + '.html'
 Invoke-Pester -Script $Script -OutputFile $xml -OutputFormat NUnitXml
-$tempFolder = 'c:\temp'
 Push-Location $tempFolder
 #download and extract ReportUnit.exe
 $url = 'http://relevantcodes.com/Tools/ReportUnit/reportunit-1.2.zip'