Fix for discovery not working on Mac machines (#2266)

* Fix for discovery not working on Mac machines * Adding test assert
microsoft · Dec 11, 2019 · 6d87e50 · 6d87e50
1 parent 3a92a40
commit 6d87e50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
@@ -260,6 +260,11 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
             {
                 var currentProcessPath = this.processHelper.GetCurrentProcessFileName();
 
+                if (string.IsNullOrEmpty(testHostPath))
+                {
+                    testHostPath = this.GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
+                }
+
                 // This host manager can create process start info for dotnet core targets only.
                 // If already running with the dotnet executable, use it; otherwise pick up the dotnet available on path.
                 // Wrap the paths with quotes in case dotnet executable is installed on a path with whitespace.

diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
@@ -253,7 +253,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExePresentOnWindows()
         }
 
         [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnix()
+        public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnixWithTestHostDllPath()
         {
             this.mockFileHelper.Setup(ph => ph.Exists("testhost.x86.exe")).Returns(true);
             this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
@@ -262,6 +262,7 @@ public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnix()
             var startInfo = this.GetDefaultStartInfo();
 
             StringAssert.Contains(startInfo.FileName, "dotnet");
+            StringAssert.Contains(startInfo.Arguments, "testhost.dll");
         }
 
         [TestMethod]