From bfb1330ca5d8f14e2d93facdde12e5e5ab37381f Mon Sep 17 00:00:00 2001
From: Mike Hendrickson <mhendric@microsoft.com>
Date: Mon, 3 Jun 2019 10:45:41 -0700
Subject: [PATCH] Port improvements to cloning of DscResource.Tests

---
 Tests/TestHelpers/CommonTestHelper.psm1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Tests/TestHelpers/CommonTestHelper.psm1 b/Tests/TestHelpers/CommonTestHelper.psm1
index 380848c..ab694de 100644
--- a/Tests/TestHelpers/CommonTestHelper.psm1
+++ b/Tests/TestHelpers/CommonTestHelper.psm1
@@ -809,7 +809,8 @@ function Test-DscResourceTestsNeedsInstallOrUpdate
         $RefreshAfterMinutes = $script:dscResourceTestsRefreshAfterMinutes
     )
 
-    $moduleRootPath = Split-Path -Path $PSScriptRoot -Parent
+    $testsFolderPath = Split-Path -Path $PSScriptRoot -Parent
+    $moduleRootPath = Split-Path -Path $testsFolderPath -Parent
     $dscResourceTestsPath = Join-Path -Path $moduleRootPath -ChildPath 'DSCResource.Tests'
 
     if (Test-Path -Path $dscResourceTestsPath)
@@ -862,7 +863,8 @@ function Install-DscResourceTestsModule
     (
     )
 
-    $moduleRootPath = Split-Path -Path $PSScriptRoot -Parent
+    $testsFolderPath = Split-Path -Path $PSScriptRoot -Parent
+    $moduleRootPath = Split-Path -Path $testsFolderPath -Parent
     $dscResourceTestsPath = Join-Path -Path $moduleRootPath -ChildPath 'DSCResource.Tests'
     $gitInstalled = $null -ne (Get-Command -Name 'git' -ErrorAction 'SilentlyContinue')
     $writeMagicFile = $false
@@ -943,7 +945,8 @@ function Exit-DscResourceTestEnvironment
         $TestEnvironment
     )
 
-    $moduleRootPath = Split-Path -Path $PSScriptRoot -Parent
+    $testsFolderPath = Split-Path -Path $PSScriptRoot -Parent
+    $moduleRootPath = Split-Path -Path $testsFolderPath -Parent
     $dscResourceTestsPath = Join-Path -Path $moduleRootPath -ChildPath 'DSCResource.Tests'
     $testHelperFilePath = Join-Path -Path $dscResourceTestsPath -ChildPath 'TestHelper.psm1'